git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2a702c2 50108c3)

author	Jakub Kicinski <kuba@kernel.org>
	Fri, 29 Mar 2024 00:24:10 +0000 (17:24 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Fri, 29 Mar 2024 00:25:57 +0000 (17:25 -0700)
commit	5e47fbe5cefe5d25d1fa4481c1b9fbe602b4a69f
tree	b86edc39098cca1d0e53e46dceec6ca856183642	tree \| snapshot
parent	2a702c2e57908e7bb5c814afeac577a14815c2f2	commit \| diff
parent	50108c352db70405b3d71d8099d0b3adc3b3352c	commit \| diff

Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

No conflicts, or adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

arch/arm64/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
arch/s390/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/helpers.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/gen.c	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/libbpf.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git