Jakub Kicinski cf1ca1f66d Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: net/ipv4/ip_gre.c 17af420545 ("erspan: make sure erspan_base_hdr is present in skb->head") 5832c4a77d ("ip_tunnel: convert __be16 tunnel flags to bitmaps") https://lore.kernel.org/all/20240402103253.3b54a1cf@canb.auug.org.au/ Adjacent changes: net/ipv6/ip6_fib.c d21d40605b ("ipv6: Fix infinite recursion in fib6_dump_done().") 5fc68320c1 ("ipv6: remove RTNL protection from inet6_dump_fib()") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2024-04-04 18:01:07 -07:00
..
asm	tools headers: Update the copy of x86's mem{cpy,set}_64.S used in 'perf bench'	2023-05-17 10:42:19 -03:00
asm-generic	perf tools headers: update the asm-generic/unaligned.h copy with the kernel sources	2024-01-31 14:02:41 -03:00
io_uring	selftests/net: Extract uring helpers to be reusable	2023-10-19 16:42:03 -06:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2024-04-04 18:01:07 -07:00
nolibc	tools/nolibc: add support for getrlimit/setrlimit	2023-12-11 22:38:35 +01:00
perf	KVM: selftests: aarch64: Update tools copy of arm_pmuv3.h	2023-12-12 09:46:22 +00:00
tools	tools include: add dis-asm-compat.h to handle version differences	2022-08-01 15:29:49 -03:00
trace/events
uapi	bpf: Sync uapi bpf.h to tools directory	2024-03-25 16:36:56 +01:00
vdso	tools headers: Synchronize {linux,vdso}/bits.h with the kernel sources	2023-03-03 22:34:15 -03:00