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

[Alexei Starovoitov]

On Wed, Mar 27, 2024 at 6:55 PM Stephen Rothwell <sfr@xxxxxxxxx.orgau> wrote:
>
> Hi all,
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
>   kernel/bpf/arena.c
>
> between commit:
>
>   ee498a38f317 ("bpf: Clarify bpf_arena comments.")
>
> from the net tree and commit:
>
>   45a683b2d815 ("bpf,arena: Use helper sizeof_field in struct accessors")
>
> 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.

Thanks for headsup.
We'll fix it up when bpf-next gets ffwded in a day or two.