From: Roman Gushchin <guro@fb.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Dennis Zhou <dennis@kernel.org>, Tejun Heo <tj@kernel.org>,
Christoph Lameter <cl@linux-foundation.org>,
Ingo Molnar <mingo@elte.hu>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
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: Mon, 7 Jun 2021 18:11:09 -0700 [thread overview]
Message-ID: <YL7DreSj2Rb+lNv2@carbon.dhcp.thefacebook.com> (raw)
In-Reply-To: <20210607183312.7dec0330@canb.auug.org.au>
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
next prev parent reply other threads:[~2021-06-08 1:11 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 [this message]
2021-07-01 3:23 ` Stephen Rothwell
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=YL7DreSj2Rb+lNv2@carbon.dhcp.thefacebook.com \
--to=guro@fb.com \
--cc=akpm@linux-foundation.org \
--cc=cl@linux-foundation.org \
--cc=dennis@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=longman@redhat.com \
--cc=mingo@elte.hu \
--cc=sfr@canb.auug.org.au \
--cc=tj@kernel.org \
--cc=vbabka@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.