Message ID | 20240328125500.2582492e@canb.auug.org.au (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Series | linux-next: manual merge of the bpf-next tree with the net tree | expand |
Context | Check | Description |
---|---|---|
netdev/tree_selection | success | Not a local patch |
On Wed, Mar 27, 2024 at 6:55 PM Stephen Rothwell <sfr@canb.auug.org.au> 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.
diff --cc kernel/bpf/arena.c index 343c3456c8dd,af5cae640669..000000000000 --- a/kernel/bpf/arena.c