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
  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>
2024-04-04 18:01:07 -07:00
..
2024-03-15 13:03:13 -07:00
2024-03-14 15:35:42 -07:00
2024-03-22 10:22:45 -07:00
2024-03-21 14:41:00 -07:00
2023-07-01 09:24:31 -07:00
2022-10-03 14:03:19 -07:00
2024-03-21 14:41:00 -07:00
2023-12-03 18:51:48 +09:00
2020-12-08 23:30:04 +09:00
2024-01-04 17:01:15 +01:00
2021-05-03 17:23:06 -06:00
2023-12-03 18:51:48 +09:00