Messages in this thread | | | Date | Mon, 5 Dec 2016 17:08:48 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the akpm-current tree with Linus' tree |
| |
Hi Michal,
On Mon, 5 Dec 2016 06:56:56 +0100 Michal Hocko <mhocko@kernel.org> wrote: > > FWIW this resolution is correct
Thanks, good to know.
> > 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. > > Sorry about that, I haven't noticed the conflict.
No worries, that is what I am here for :-)
-- Cheers, Stephen Rothwell
| |