On Wed, Jan 24, 2024 at 12:18 AM Andrew Morton
<akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> On Tue, 23 Jan 2024 17:18:55 -0800 Alexei Starovoitov <alexei.starovoitov@xxxxxxxxx> 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.
