On Sun, Jan 24, 2021 at 11:14 PM Stephen Rothwell <[email protected]> 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 good, thanks!
Arnd
