Subject: Re: linux-next: manual merge of the akpm-current tree with the percpu tree

From: Roman Gushchin <[email-masked]>
Date: Mon, 7 Jun 2021 18:11:09 -0700

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