Re: [gitdm PATCH 1/2] Merge branch 'master' into u-boot

2022-07-12 Thread Simon Glass
On Thu, 7 Jul 2022 at 13:22, Tom Rini wrote: > > Bring us up to commit 0b8875225750 ("Allow multiple spaces within an > email address") of the upstream gitdm project. > > Signed-off-by: Tom Rini > > --- > So this isn't a real patch exactly. This shows what the single merge > error would need to

[gitdm PATCH 1/2] Merge branch 'master' into u-boot

2022-07-07 Thread Tom Rini
Bring us up to commit 0b8875225750 ("Allow multiple spaces within an email address") of the upstream gitdm project. Signed-off-by: Tom Rini --- So this isn't a real patch exactly. This shows what the single merge error would need to be corrected as, in order to bring our tree up to the abo