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

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