netdev - 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] [day] [month] [year] [list]

Message-ID: <CAADnVQJe-BxbKYsMUXXrsh4wEUPacDT6RtF_qrO1ewns_8T1_w@mail.gmail.com>
Date: Wed, 24 Jan 2024 07:34:54 -0800
From: Alexei Starovoitov <alexei.starovoitov@...il.com>
To: Andrew Morton <akpm@...ux-foundation.org>
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 Wed, Jan 24, 2024 at 12:18 AM Andrew Morton
<akpm@...ux-foundation.org> 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.

hmm. There was a clear feedback on the v1 of the series not to mix bpf
and non-bpf patches and a standalone patch was sent as v2.

Thanks.