From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jakub Kicinski <kuba@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Roman Gushchin <guro@fb.com>, David Miller <davem@davemloft.net>,
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: Tue, 15 Dec 2020 13:23:05 +1100 [thread overview]
Message-ID: <20201215132305.5f5a1c2b@canb.auug.org.au> (raw)
In-Reply-To: <20201214180629.4fee48ae@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
Hi Jakub,
On Mon, 14 Dec 2020 18:06:29 -0800 Jakub Kicinski <kuba@kernel.org> wrote:
>
> AFAIU all we can do is tell Linus about the merge issue, and point
> at Stephen's resolution.
This is the correct response.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-12-15 2:42 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
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 [this message]
-- 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=20201215132305.5f5a1c2b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=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=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).