Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 6 Jun 2024 18:33:09 +0000 (11:33 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 6 Jun 2024 19:06:56 +0000 (12:06 -0700)
commit62b5bf58b928f0f4fcc8bb633b63795517825d31
tree7331b7fad6fd30251fff3ebbd095680a1db328dd
parent749332814479ad2e06d892109227d3d93032f65b
parentd30d0e49da71de8df10bf3ff1b3de880653af562
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

drivers/net/ethernet/pensando/ionic/ionic_txrx.c
  d9c04209990b ("ionic: Mark error paths in the data path as unlikely")
  491aee894a08 ("ionic: fix kernel panic in XDP_TX action")

net/ipv6/ip6_fib.c
  b4cb4a1391dc ("net: use unrcu_pointer() helper")
  b01e1c030770 ("ipv6: fix possible race in __fib6_drop_pcpu_from()")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
MAINTAINERS
arch/riscv/Kconfig
drivers/net/ethernet/intel/ice/ice_type.h
drivers/net/ethernet/pensando/ionic/ionic_txrx.c
drivers/net/vmxnet3/vmxnet3_drv.c
net/core/dev.c
net/ipv4/tcp.c
net/ipv6/ip6_fib.c
net/ipv6/route.c
net/mptcp/protocol.c
net/unix/af_unix.c