Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

drivers/net/ethernet/intel/igc/igc_main.c
  06b412589eef ("igc: Add lock to safeguard global Qbv variables")
  d3750076d464 ("igc: Add TransmissionOverrun counter")

drivers/net/ethernet/microsoft/mana/mana_en.c
  a7dfeda6fdec ("net: mana: Fix MANA VF unload when hardware is unresponsive")
  a9ca9f9ceff3 ("page_pool: split types and declarations from page_pool.h")
  92272ec4107e ("eth: add missing xdp.h includes in drivers")

net/mptcp/protocol.h
  511b90e39250 ("mptcp: fix disconnect vs accept race")
  b8dc6d6ce931 ("mptcp: fix rcv buffer auto-tuning")

tools/testing/selftests/net/mptcp/mptcp_join.sh
  c8c101ae390a ("selftests: mptcp: join: fix 'implicit EP' test")
  03668c65d153 ("selftests: mptcp: join: rework detailed report")

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/dsa/ocelot/felix.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmvnic.c
Simple merge

diff --cc drivers/net/ethernet/intel/igc/igc.h
Simple merge

diff --cc drivers/net/ethernet/intel/igc/igc_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
Simple merge

diff --cc drivers/net/ethernet/microsoft/mana/mana_en.c
Simple merge

diff --cc drivers/net/ethernet/pensando/ionic/ionic_lif.c
Simple merge

diff --cc drivers/net/phy/at803x.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/net/wireless/ath/ath12k/wmi.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtw89/mac.c
Simple merge

diff --cc net/core/filter.c
Simple merge

diff --cc net/core/skmsg.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/ipv4/nexthop.c
Simple merge

diff --cc net/ipv6/ndisc.c
Simple merge

diff --cc net/mptcp/protocol.c
Simple merge

diff --cc net/mptcp/protocol.h
Simple merge

diff --cc net/mptcp/subflow.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/tls/tls_device.c
Simple merge

diff --cc net/tls/tls_main.c
Simple merge

diff --cc net/xdp/xsk.c
Simple merge

diff --cc tools/testing/selftests/net/fib_nexthops.sh
Simple merge

diff --cc tools/testing/selftests/net/forwarding/lib.sh
Simple merge

diff --cc tools/testing/selftests/net/mptcp/mptcp_join.sh
Simple merge