Re: linux-next: manual merge of the akpm-current tree with Linus' tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the akpm-current tree with Linus' tree
Date	2016-12-05 07:10 +0100
Message-ID	<sKUDn-JO-1@gated-at.bofh.it> (permalink)
References	<sKUal-jw-1@gated-at.bofh.it> <sKUtH-qx-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the akpm-current tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-12-05 06:40 +0100
  Re: linux-next: manual merge of the akpm-current tree with Linus'  tree Michal Hocko <mhocko@kernel.org> - 2016-12-05 07:00 +0100
    Re: linux-next: manual merge of the akpm-current tree with Linus'  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-12-05 07:10 +0100

csiph-web