On Tue, 19 Oct 2021 at 17:17, Tom Rini <tr...@konsulko.com> wrote: > > On Tue, Oct 19, 2021 at 08:03:07AM -0600, Simon Glass wrote:
[...] > > > > For some reason this still does not apply for me on -master. Can you > > please confirm the hash you are using? > > The hunk for scripts/Makefile.spl still fails (it failed on v3 as well), > but is easily fixed-up, fwiw. The reason is that I rebased on top of the prerequisite series, but failed to pull in -master. As Tom says it's a single line of code that's in conflict. Shall I send a v5 or will you pull that in Tom? Thanks /Ilias > > -- > Tom
