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

[Daniel Borkmann]

On 9/14/26 1:31 PM, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
>    tools/testing/selftests/bpf/prog_tests/verifier.c
>
> between commit:
>
>    a903f145a8914 ("selftests/bpf: Add tests for the KF_PERFMON gates")
>
> from the bpf tree and commit:
>
>    5647b77587ce1 ("selftests/bpf: Test kfunc packet memory direct writes")
>
> from the bpf-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
lgtm