From: Andrew Morton <akpm@linux-foundation.org>
To: Roman Gushchin <guro@fb.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Networking <netdev@vger.kernel.org>,
Alex Shi <alex.shi@linux.alibaba.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Shakeel Butt <shakeelb@google.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the bpf-next tree
Date: Mon, 14 Dec 2020 17:40:21 -0800 [thread overview]
Message-ID: <20201214174021.2dfc2fbd99ca3e72b3e4eb02@linux-foundation.org> (raw)
In-Reply-To: <20201215012943.GA3079589@carbon.DHCP.thefacebook.com>
On Mon, 14 Dec 2020 17:29:43 -0800 Roman Gushchin <guro@fb.com> wrote:
> On Tue, Dec 15, 2020 at 07:21:56AM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > On Fri, 4 Dec 2020 20:20:05 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Today's linux-next merge of the akpm-current tree got conflicts in:
> > >
> > > include/linux/memcontrol.h
> > > mm/memcontrol.c
> > >
> > > between commit:
> > >
> > > bcfe06bf2622 ("mm: memcontrol: Use helpers to read page's memcg data")
> > >
> > > from the bpf-next tree and commits:
> > >
> > > 6771a349b8c3 ("mm/memcg: remove incorrect comment")
> > > c3970fcb1f21 ("mm: move lruvec stats update functions to vmstat.h")
> > >
> > > from the akpm-current tree.
> > >
> ...
> >
> > Just a reminder that this conflict still exists. Commit bcfe06bf2622
> > is now in the net-next tree.
>
> Thanks, Stephen!
>
> I wonder if it's better to update these 2 commits in the mm tree to avoid
> conflicts?
>
> Basically split your fix into two and merge it into mm commits.
> The last chunk in the patch should be merged into "mm/memcg: remove incorrect comment".
> And the rest into "mm: move lruvec stats update functions to vmstat.h".
>
> Andrew, what do you think?
I have "mm/memcg: remove incorrect comment" and "mm: move lruvec stats
update functions to vmstat.h" staged against Linus's tree and plan to
send them to him later today. So I trust the BPF tree maintainers will
be able to resolve these minor things when those patches turn up in
mainline.
next prev parent reply other threads:[~2020-12-15 1:41 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-04 9:20 linux-next: manual merge of the akpm-current tree with the bpf-next tree Stephen Rothwell
2020-12-14 20:21 ` Stephen Rothwell
2020-12-15 1:29 ` Roman Gushchin
2020-12-15 1:40 ` Andrew Morton [this message]
2020-12-15 2:06 ` Jakub Kicinski
2020-12-15 2:11 ` Andrew Morton
2020-12-15 2:13 ` Jakub Kicinski
2020-12-15 2:23 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-03-15 11:57 Stephen Rothwell
2022-02-03 3:52 Stephen Rothwell
2020-04-29 6:45 Stephen Rothwell
2020-04-29 6:47 ` Christoph Hellwig
2020-04-29 6:49 ` Alexei Starovoitov
2020-04-29 6:54 ` Christoph Hellwig
2020-04-29 8:24 ` Stephen Rothwell
2020-05-01 4:00 ` Al Viro
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=20201214174021.2dfc2fbd99ca3e72b3e4eb02@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=alex.shi@linux.alibaba.com \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=guro@fb.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=shakeelb@google.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).