linux-kernel - Re: linux-next: manual merge of the bpf-next tree with the mm tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20240124001808.bfff657f089afe10e5b0824c@linux-foundation.org>
Date: Wed, 24 Jan 2024 00:18:08 -0800
From: Andrew Morton <akpm@...ux-foundation.org>
To: Alexei Starovoitov <alexei.starovoitov@...il.com>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>, Daniel Borkmann
 <daniel@...earbox.net>, 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 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.