tree 3482f65987c61b1e46b5862352c8f45ac30442e6
parent 1148c4098e918b4ffb3cc222b897c465328d2391
parent c88b9b4cde17aec34fb9bfaf69f9f72a1c44f511
author Jakub Kicinski <kuba@kernel.org> 1712275398 -0700
committer Jakub Kicinski <kuba@kernel.org> 1712278867 -0700

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
  17af420545a7 ("erspan: make sure erspan_base_hdr is present in skb->head")
  5832c4a77d69 ("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
  d21d40605bca ("ipv6: Fix infinite recursion in fib6_dump_done().")
  5fc68320c1fb ("ipv6: remove RTNL protection from inet6_dump_fib()")

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