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

From
Alexei Starovoitov <hidden>
Date
2026-11-19 01:17:09
Also in
bpf, linux-next, lkml
Reply to
J4f J4f, 2026-11-18
On Wed Nov 18, 2026 at 3:47 PM UTC, J4f J4f wrote:
On Wed, 18 Nov 2026 at 05:36, Mark Brown [off-list ref] wrote:
quoted
Hi all,

Today's linux-next merge of the bpf-next tree got a conflict in:

  kernel/bpf/btf.c

between commit:

  b7cc45994c3f9 ("bpf: Check variable-offset accesses against special fields")

from the bpf tree and commit:

  ca4395aade31a ("bpf: Walk each type once when looking for special fields")

from the bpf-next tree.  I'm not confident of this merge, it discards
the bpf commit on the basis that it looks like there is some new
handling of special fields in the bpf-next tree but I'm not sure that
overlaps with the fix.

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.
Hi Mark,

Thanks for the report.

I reproduced this on bpf-next master: the rewrite does not cover the fix,
the check in btf_struct_access() now only looks at min_off again. I will
send a v4 rebased on top of the bpf-next series shortly.
Pls ask your bot to stop doing stupid things.
Thread (3 messages) 3 messages, 3 authors, last reply 2d ago
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help