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] [thread-next>] [day] [month] [year] [list]

Message-ID: <YL7DreSj2Rb+lNv2@carbon.dhcp.thefacebook.com>
Date:   Mon, 7 Jun 2021 18:11:09 -0700
From:   Roman Gushchin <guro@...com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
CC:     Andrew Morton <akpm@...ux-foundation.org>,
        Dennis Zhou <dennis@...nel.org>, Tejun Heo <tj@...nel.org>,
        Christoph Lameter <cl@...ux-foundation.org>,
        Ingo Molnar <mingo@...e.hu>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Vlastimil Babka <vbabka@...e.cz>,
        Waiman Long <longman@...hat.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 percpu tree

On Mon, Jun 07, 2021 at 06:33:12PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   mm/memcontrol.c
> 
> between commit:
> 
>   0f0cace35fa6 ("mm, memcg: mark cgroup_memory_nosocket, nokmem and noswap as __ro_after_init")
> 
> from the percpu tree and commits:
> 
>   dfe14954c6e4 ("mm: memcg/slab: don't create kmalloc-cg caches with cgroup.memory=nokmem")
>   3fd971b13287 ("mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5")
>   53270d6d0c1f ("mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5-fix")
> 
> from the akpm-current tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thank you, Stephen!

The resulting patch looks good to me.

Roman