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

[Alexei Starovoitov]

On Tue, Feb 24, 2026 at 4:39 AM Mark Brown <broonie@xxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
>   tools/testing/selftests/bpf/prog_tests/align.c
>
> between commit:
>
>   05849ec34f3d7 ("selftests/bpf: Replace strncpy() with strscpy()")
>
> from the bpf tree and commit:
>
>   f632de6e19553 ("selftests/bpf: Migrate align.c tests to test_loader framework")
>
> 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.
>
> (deleted the file)

Thanks for heads up.
Since the file is deleted in bpf-next anyway I dropped this hunk
of patch 05849ec34f3d7 and force pushed bpf tree.
There should be no conflict anymore. Saves the headache for us
to resolve it when bpf goes to Linus and then back to bpf-next.