Received-SPF: pass (google.com: domain of linux-kernel+bounces-37263-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
MIME-Version: 1.0
References: <20240124121605.1c4cc5bc@canb.auug.org.au> <CAADnVQKBCpkwx1HVaNy1wmHqVrekgkd4LEZm9UzqOkOBniTOyw@mail.gmail.com>
 <20240124001808.bfff657f089afe10e5b0824c@linux-foundation.org>
In-Reply-To: <20240124001808.bfff657f089afe10e5b0824c@linux-foundation.org>
From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Date: Wed, 24 Jan 2024 07:34:54 -0800
Message-ID: <CAADnVQJe-BxbKYsMUXXrsh4wEUPacDT6RtF_qrO1ewns_8T1_w@mail.gmail.com>
Subject: Re: linux-next: manual merge of the bpf-next tree with the mm tree
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, Daniel Borkmann <daniel@iogearbox.net>, 
	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>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Wed, Jan 24, 2024 at 12:18=E2=80=AFAM Andrew Morton
<akpm@linux-foundation.org> 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.

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.