From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dennis Zhou <dennis@kernel•org>, Tejun Heo <tj@kernel•org>,
Christoph Lameter <cl@linux-foundation•org>,
Ingo Molnar <mingo@elte•hu>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Roman Gushchin <guro@fb•com>, Vlastimil Babka <vbabka@suse•cz>,
Waiman Long <longman@redhat•com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the percpu tree
Date: Thu, 1 Jul 2021 13:23:16 +1000 [thread overview]
Message-ID: <20210701132316.01b6252a@canb.auug.org.au> (raw)
In-Reply-To: <20210607183312.7dec0330@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2025 bytes --]
Hi all,
On Mon, 7 Jun 2021 18:33:12 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> 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. This
> is now fixed as far as linux-next is concerned, 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.
>
> Andrew, you may want to look at commit
>
> 4d5c8aedc8aa ("mm, memcg: introduce mem_cgroup_kmem_disabled()")
>
> from the percpu tree.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc mm/memcontrol.c
> index 3c1641c67122,b9a6db6a7d4f..000000000000
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@@ -80,10 -80,10 +80,10 @@@ struct mem_cgroup *root_mem_cgroup __re
> DEFINE_PER_CPU(struct mem_cgroup *, int_active_memcg);
>
> /* Socket memory accounting disabled? */
> -static bool cgroup_memory_nosocket;
> +static bool cgroup_memory_nosocket __ro_after_init;
>
> /* Kernel memory accounting disabled? */
> - static bool cgroup_memory_nokmem __ro_after_init;
> -bool cgroup_memory_nokmem;
> ++bool cgroup_memory_nokmem __ro_after_init;
>
> /* Whether the swap controller is active */
> #ifdef CONFIG_MEMCG_SWAP
This is now a conflict between the percpu tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-07-01 3:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-07 8:33 linux-next: manual merge of the akpm-current tree with the percpu tree Stephen Rothwell
2021-06-08 1:11 ` Roman Gushchin
2021-07-01 3:23 ` Stephen Rothwell [this message]
2021-07-01 3:31 ` Dennis Zhou
-- strict thread matches above, loose matches on Subject: below --
2016-10-06 2:43 Stephen Rothwell
2016-10-06 2:46 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210701132316.01b6252a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=cl@linux-foundation$(echo .)org \
--cc=dennis@kernel$(echo .)org \
--cc=guro@fb$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=longman@redhat$(echo .)com \
--cc=mingo@elte$(echo .)hu \
--cc=tj@kernel$(echo .)org \
--cc=vbabka@suse$(echo .)cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox