lkml.org 
[lkml]   [2016]   [Dec]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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

\
 
 \ /
  Last update: 2016-12-05 07:09    [W:0.140 / U:0.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site