]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 7.0-rc3
authorAlexei Starovoitov <ast@kernel.org>
Mon, 9 Mar 2026 00:46:38 +0000 (17:46 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Mon, 9 Mar 2026 00:46:38 +0000 (17:46 -0700)
Cross-merge BPF and other fixes after downstream PR.

No conflicts.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
1  2 
kernel/bpf/verifier.c
net/xdp/xsk.c
tools/testing/selftests/bpf/Makefile
tools/testing/selftests/bpf/progs/exceptions_assert.c
tools/testing/selftests/bpf/progs/verifier_bounds.c

Simple merge
diff --cc net/xdp/xsk.c
Simple merge
Simple merge