GitLab

Cross-merge networking fixes after downstream PR.

Conflicts:

net/dsa/port.c
  9945c1fb ("net: dsa: fix older DSA drivers using phylink")
  a88dd753 ("net: dsa: remove legacy_pre_march2020 detection")
https://lore.kernel.org/all/20230731102254.2c9868ca@canb.auug.org.au/

net/xdp/xsk.c
  3c5b4d69 ("net: annotate data-races around sk->sk_mark")
  b7f72a30 ("xsk: introduce wrappers and helpers for supporting multi-buffer in Tx path")
https://lore.kernel.org/all/20230731102631.39988412@canb.auug.org.au/

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  37b61cda ("bnxt: don't handle XDP in netpoll")
  2b56b3d9 ("eth: bnxt: handle invalid Tx completions more gracefully")
https://lore.kernel.org/all/20230801101708.1dc7faac@canb.auug.org.au/

Adjacent changes:

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
  62da0833 ("net/mlx5e: Set proper IPsec source port in L4 selector")
  fbd51754 ("net/mlx5e: Add function to get IPsec offload namespace")

drivers/net/ethernet/sfc/selftest.c
  55c1528f ("sfc: fix field-spanning memcpy in selftest")
  ae9d445c

 ("sfc: Miscellaneous comment removals")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>