From: Daniel Borkmann <daniel@iogearbox.net>
To: Andrew Morton <akpm@linux-foundation.org>,
Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>, bpf <bpf@vger.kernel.org>,
Networking <netdev@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Nathan Chancellor <nathan@kernel.org>
Subject: Re: linux-next: manual merge of the bpf-next tree with the mm tree
Date: Wed, 24 Jan 2024 10:46:34 +0100 [thread overview]
Message-ID: <8cd3a7f4-db72-dc8f-581c-40d115562c55@iogearbox.net> (raw)
In-Reply-To: <20240124001808.bfff657f089afe10e5b0824c@linux-foundation.org>
On 1/24/24 9:18 AM, Andrew Morton wrote:
> On Tue, 23 Jan 2024 17:18:55 -0800 Alexei Starovoitov <alexei.starovoitov@gmail.com> wrote:
>
>>> Today's linux-next merge of the bpf-next tree got a conflict in:
>>>
>>> tools/testing/selftests/bpf/README.rst
>>>
>>> between commit:
>>>
>>> 0d57063bef1b ("selftests/bpf: update LLVM Phabricator links")
>>>
>>> from the mm-nonmm-unstable branch of the mm tree and commit:
>>>
>>> f067074bafd5 ("selftests/bpf: Update LLVM Phabricator links")
>>>
>>> from the bpf-next tree.
>>
>> Andrew,
>> please drop the bpf related commit from your tree.
>
> um, please don't cherry-pick a single patch from a multi-patch series
> which I have already applied.
The BPF one was actually a stand-alone patch targetted at bpf-next:
https://lore.kernel.org/bpf/20240111-bpf-update-llvm-phabricator-links-v2-1-9a7ae976bd64@kernel.org/
next prev parent reply other threads:[~2024-01-24 9:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-24 1:16 Stephen Rothwell
2024-01-24 1:18 ` Alexei Starovoitov
2024-01-24 8:18 ` Andrew Morton
2024-01-24 9:46 ` Daniel Borkmann [this message]
2024-01-24 15:34 ` Alexei Starovoitov
2025-03-11 1:04 Stephen Rothwell
2025-03-11 13:30 ` Luiz Capitulino
2025-03-11 13:33 ` Alexei Starovoitov
2025-03-30 23:27 ` Stephen Rothwell
2025-03-31 14:19 ` Luiz Capitulino
2025-03-31 14:25 ` Andrew Morton
2026-09-21 9:49 Mark Brown
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=8cd3a7f4-db72-dc8f-581c-40d115562c55@iogearbox.net \
--to=daniel@iogearbox.net \
--cc=akpm@linux-foundation.org \
--cc=alexei.starovoitov@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nathan@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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
all inboxes | Powered by JetHome®