mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-12-26 12:21:01 +01:00
Cross-merge networking fixes after downstream PR. Conflicts: net/ipv4/ip_gre.c17af420545("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.cd21d40605b("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>