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

[Alexei Starovoitov <alexei.starovoitov@xxxxxxxxx>]

On Tue, Jan 23, 2024 at 5:16 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> 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.

Thanks