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

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

No conflicts.

Adjacent changes:

include/net/sock.h
  c51613fa276f ("net: add sk->sk_drop_counters")
  5d6b58c932ec ("net: lockless sock_i_ino()")

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/cadence/macb_main.c
Simple merge

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

diff --cc drivers/net/ethernet/intel/idpf/idpf_lib.c
Simple merge

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

diff --cc drivers/net/ethernet/microchip/lan865x/lan865x.c
Simple merge

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

diff --cc drivers/net/ppp/ppp_generic.c
Simple merge

diff --cc include/linux/phy.h
Simple merge

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

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

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

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

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

diff --cc net/netfilter/nf_tables_api.c
Simple merge

diff --cc net/smc/smc_ib.c
Simple merge

diff --cc tools/net/ynl/pyynl/ynl_gen_c.py
Simple merge

diff --cc tools/testing/selftests/net/Makefile
Simple merge