linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the percpu 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: <20161006134636.7505d76e@canb.auug.org.au>
Date:   Thu, 6 Oct 2016 13:46:36 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Tejun Heo <tj@...nel.org>,
        Rusty Russell <rusty@...tcorp.com.au>,
        Christoph Lameter <cl@...ux-foundation.org>,
        Ingo Molnar <mingo@...e.hu>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        zijun_hu <zijun_hu@....com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 percpu tree

Hi all,

On Thu, 6 Oct 2016 13:43:57 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   mm/percpu.c
> 
> between commits:
> 
>   93c76b6b2faa ("mm/percpu.c: correct max_distance calculation for pcpu_embed_first_chunk()")
>   9b7396624a7b ("mm/percpu.c: fix potential memory leakage for pcpu_embed_first_chunk()")
> 
> from the percpu tree and commit:
> 
>   567f646230a5 ("mm/percpu.c: correct max_distance calculation for pcpu_embed_first_chunk()")
> 
> from the akpm-current tree.
> 
> There is one small differenve between 567f646230a5 and 9b7396624a7b and
> then further changes in 93c76b6b2faa.

Cut an paste error.  Should have said:

There is one small difference between 567f646230a5 and 93c76b6b2faa and
then further changes in 9b7396624a7b.

-- 
Cheers,
Stephen Rothwell