On Mon, Oct 18, 2021 at 6:51 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. Looks correct, thanks Stephen! I am glad you didn't have more conflicts after the rebase to v5.15-rc5. Cheers, Miguel
