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

Cross-merge networking fixes after downstream PR.

Conflicts:

include/linux/mlx5/driver.h
  617f5db1 ("RDMA/mlx5: Fix affinity assignment")
  dc131808 ("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
  47867f0a ("selftests: mptcp: join: skip check if MIB counter not supported")
  425ba803 ("selftests: mptcp: join: support RM_ADDR for used endpoints or not")
  45b1a122 ("mptcp: introduces more address related mibs")
  0639fa23 ("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>