| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 24 Jan 2024 10:46:34 +0100
From: Daniel Borkmann <daniel@...earbox.net>
To: Andrew Morton <akpm@...ux-foundation.org>,
Alexei Starovoitov <alexei.starovoitov@...il.com>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
Alexei Starovoitov <ast@...nel.org>, Andrii Nakryiko <andrii@...nel.org>,
bpf <bpf@...r.kernel.org>, Networking <netdev@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>,
Nathan Chancellor <nathan@...nel.org>
Subject: Re: linux-next: manual merge of the bpf-next tree with the mm tree
On 1/24/24 9:18 AM, Andrew Morton wrote:
> On Tue, 23 Jan 2024 17:18:55 -0800 Alexei Starovoitov <alexei.starovoitov@...il.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/
Powered by blists - more mailing lists