On Thu, Nov 9, 2017 at 3:31 PM, Stephen Rothwell <s...@canb.auug.org.au> wrote: > I fixed it up (I think - 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.
It looks good to me. Thanks!
