Cross-merge networking fixes after downstream PR. Conflicts: include/linux/mlx5/driver.h 617f5db1a6 ("RDMA/mlx5: Fix affinity assignment") dc13180824 ("net/mlx5: Enable devlink port for embedded cpu VF vports") https://lore.kernel.org/all/20230613125939.595e50b8@canb.auug.org.au/ tools/testing/selftests/net/mptcp/mptcp_join.sh 47867f0a7e ("selftests: mptcp: join: skip check if MIB counter not supported") 425ba80312 ("selftests: mptcp: join: support RM_ADDR for used endpoints or not") 45b1a1227a ("mptcp: introduces more address related mibs") 0639fa230a ("selftests: mptcp: add explicit check for new mibs") https://lore.kernel.org/netdev/20230609-upstream-net-20230610-mptcp-selftests-support-old-kernels-part-3-v1-0-2896fe2ee8a3@tessares.net/ No adjacent changes. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
617f5db1a6
dc13180824
47867f0a7e
425ba80312
45b1a1227a
0639fa230a