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

Cross-merge networking fixes after downstream PR (net-6.17-rc7).

No conflicts.

Adjacent changes:

drivers/net/ethernet/mellanox/mlx5/core/en/fs.h
  9536fbe10c9d ("net/mlx5e: Add PSP steering in local NIC RX")
  7601a0a46216 ("net/mlx5e: Add a miss level for ipsec crypto offload")

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

diff --cc Documentation/netlink/specs/conntrack.yaml
Simple merge

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/net/ethernet/intel/i40e/i40e_txrx.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_txrx.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

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

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

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

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

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c
Simple merge

diff --cc include/linux/mlx5/driver.h
Simple merge

diff --cc include/net/sock.h
Simple merge

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

diff --cc net/ethtool/common.c
Simple merge

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

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

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

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

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

diff --cc tools/testing/selftests/net/mptcp/mptcp_sockopt.c
Simple merge

diff --cc tools/testing/selftests/net/tls.c
Simple merge