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

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

No conflicts, adjacent changes:

drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
  cc199cd1b912 ("net/mlx5e: Reduce branches in napi poll")
  c326f9c68921 ("net/mlx5e: xsk: Fix unlocked writing to ICOSQ")

drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
  c6df9a65cbb0 ("net/mlx5: Skip disabled vports when setting max TX speed")
  1fba57c91416 ("net/mlx5: Add VHCA_ID page management mode support")

net/mac80211/mlme.c
  a6e6ccd5bd07 ("wifi: mac80211: consume only present negotiated TTLM maps")
  49e62ec6eb06 ("wifi: mac80211: move frame RX handling to type files")

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

diff --cc Documentation/networking/device_drivers/ethernet/index.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/dpll/zl3073x/dpll.c
Simple merge

diff --cc drivers/net/ethernet/airoha/airoha_eth.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Simple merge

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
index 143890af516a6a9a09185f9b4d5d69e0c1f713ac,e90c6c6df835dd1fa8fa5498544e0950e32cf987..1851056064698beefda173beea2b4f6d01e216e1
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
@@@ -248,12 -247,12 +248,12 @@@ int mlx5e_napi_poll(struct napi_struct 
                        mlx5e_cq_arm(&xsksq->cq);
                        mlx5e_cq_arm(&xskrq->cq);
                }
 +              if (c->xdpsq)
 +                      mlx5e_cq_arm(&c->xdpsq->cq);
        }
 -      if (c->xdpsq)
 -              mlx5e_cq_arm(&c->xdpsq->cq);
  
        if (unlikely(aff_change && busy_xsk)) {
-               mlx5e_trigger_irq(&c->icosq);
+               mlx5e_trigger_napi_async_icosq(c);
                ch_stats->force_irq++;
        }
  

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

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

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

diff --cc drivers/net/ovpn/udp.c
Simple merge

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

diff --cc net/bridge/br_multicast.c
Simple merge

diff --cc net/bridge/br_netlink.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc net/l2tp/l2tp_core.c
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/mac80211/parse.c
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/wireless/wext-compat.c
Simple merge

diff --cc tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh
Simple merge

diff --cc tools/testing/selftests/net/mptcp/mptcp_join.sh
Simple merge