From: Christoph Hellwig <hch@lst.de>
To: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Christoph Hellwig <hch@lst.de>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Andrew Morton <akpm@linux-foundation.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Networking <netdev@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Al Viro <viro@zeniv.linux.org.uk>,
Xiaoming Ni <nixiaoming@huawei.com>,
"Guilherme G. Piccoli" <gpiccoli@canonical.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the bpf-next tree
Date: Wed, 29 Apr 2020 08:54:04 +0200 [thread overview]
Message-ID: <20200429065404.GA32139@lst.de> (raw)
In-Reply-To: <CAADnVQJWLPpt6tEGo=KkLBaHLpwZFLBfZX7UB4Z6+hMf6g220w@mail.gmail.com>
On Tue, Apr 28, 2020 at 11:49:34PM -0700, Alexei Starovoitov wrote:
> On Tue, Apr 28, 2020 at 11:47 PM Christoph Hellwig <hch@lst.de> wrote:
> >
> > On Wed, Apr 29, 2020 at 04:45:07PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Today's linux-next merge of the akpm-current tree got a conflict in:
> > >
> > > kernel/sysctl.c
> > >
> > > between commit:
> > >
> > > f461d2dcd511 ("sysctl: avoid forward declarations")
> > >
> > > from the bpf-next tree and commits:
> >
> > Hmm, the above should have gone in through Al..
>
> Al pushed them into vfs tree and we pulled that tag into bpf-next.
Ok. And Stephen pulled your tree first.
next prev parent reply other threads:[~2020-04-29 6:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 6:45 linux-next: manual merge of the akpm-current tree with the bpf-next tree Stephen Rothwell
2020-04-29 6:47 ` Christoph Hellwig
2020-04-29 6:49 ` Alexei Starovoitov
2020-04-29 6:54 ` Christoph Hellwig [this message]
2020-04-29 8:24 ` Stephen Rothwell
2020-05-01 4:00 ` Al Viro
2020-12-04 9:20 Stephen Rothwell
2020-12-14 20:21 ` Stephen Rothwell
2020-12-15 1:29 ` Roman Gushchin
2020-12-15 1:40 ` Andrew Morton
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
2022-02-03 3:52 Stephen Rothwell
2022-03-15 11:57 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=20200429065404.GA32139@lst.de \
--to=hch@lst.de \
--cc=akpm@linux-foundation.org \
--cc=alexei.starovoitov@gmail.com \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=gpiccoli@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nixiaoming@huawei.com \
--cc=sfr@canb.auug.org.au \
--cc=viro@zeniv.linux.org.uk \
/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).