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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20161205170848.6952c08f@canb.auug.org.au>
Date:   Mon, 5 Dec 2016 17:08:48 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Michal Hocko <mhocko@...nel.org>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Johannes Weiner <hannes@...xchg.org>
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@...nel.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