]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 29 Mar 2024 00:24:10 +0000 (17:24 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 29 Mar 2024 00:25:57 +0000 (17:25 -0700)
Cross-merge networking fixes after downstream PR.

No conflicts, or adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1  2 
arch/arm64/net/bpf_jit_comp.c
arch/s390/net/bpf_jit_comp.c
include/linux/skbuff.h
kernel/bpf/helpers.c
kernel/bpf/verifier.c
tools/bpf/bpftool/gen.c
tools/lib/bpf/libbpf.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge