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

Cross-merge networking fixes after downstream PR.

Conflicts:

net/mac80211/rx.c
  91535613b609 ("wifi: mac80211: don't drop all unprotected public action frames")
  6c02fab72429 ("wifi: mac80211: split ieee80211_drop_unencrypted_mgmt() return value")

Adjacent changes:

drivers/net/ethernet/apm/xgene/xgene_enet_main.c
  61471264c018 ("net: ethernet: apm: Convert to platform remove callback returning void")
  d2ca43f30611 ("net: xgene: Fix unused xgene_enet_of_match warning for !CONFIG_OF")

net/vmw_vsock/virtio_transport.c
  64c99d2d6ada ("vsock/virtio: support to send non-linear skb")
  53b08c498515 ("vsock/virtio: initialize the_virtio_vsock before using VQs")

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/apm/xgene/xgene_enet_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e.h
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_txrx.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_xsk.c
Simple merge

diff --cc drivers/net/ethernet/intel/iavf/iavf_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/intel/igc/igc_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169_main.c
Simple merge

diff --cc drivers/net/ethernet/sfc/tc.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

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

diff --cc drivers/net/usb/r8152.c
Simple merge

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

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

diff --cc kernel/trace/trace_kprobe.c
Simple merge

diff --cc net/handshake/netlink.c
Simple merge

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

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

diff --cc net/mac80211/rx.c
index 051db97a92b4007faa1c97c71fc595522782c79e,8f6b6f56b65b4353ea0be6a99358b30970dfcb29..2d48485142bb5e867ba446967321abe13a618177
--- 1/net/mac80211/rx.c
--- 2/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@@ -2469,15 -2468,14 +2469,14 @@@ ieee80211_drop_unencrypted_mgmt(struct 
  
                /* drop unicast public action frames when using MPF */
                if (is_unicast_ether_addr(mgmt->da) &&
-                   ieee80211_is_public_action((void *)rx->skb->data,
-                                              rx->skb->len))
+                   ieee80211_is_protected_dual_of_public_action(rx->skb))
 -                      return -EACCES;
 +                      return RX_DROP_U_UNPROT_UNICAST_PUB_ACTION;
        }
  
 -      return 0;
 +      return RX_CONTINUE;
  }
  
 -static int
 +static ieee80211_rx_result
  __ieee80211_data_to_8023(struct ieee80211_rx_data *rx, bool *port_control)
  {
        struct ieee80211_sub_if_data *sdata = rx->sdata;

diff --cc net/sched/act_ct.c
Simple merge

diff --cc net/vmw_vsock/virtio_transport.c
index d324ae13e2f5ab1168ab03d86960b7d12b6b7b18,b80bf681327bd31c48a7b3022a35faf32a009e5b..af5bab1acee17deafec1062aecf0477164e42eed
--- 1/net/vmw_vsock/virtio_transport.c
--- 2/net/vmw_vsock/virtio_transport.c
+++ b/net/vmw_vsock/virtio_transport.c
@@@ -745,10 -677,8 +759,11 @@@ static int virtio_vsock_probe(struct vi
        if (ret < 0)
                goto out;
  
 +      for (i = 0; i < ARRAY_SIZE(vsock->out_sgs); i++)
 +              vsock->out_sgs[i] = &vsock->out_bufs[i];
 +
        rcu_assign_pointer(the_virtio_vsock, vsock);
+       virtio_vsock_vqs_start(vsock);
  
        mutex_unlock(&the_virtio_vsock_mutex);
  

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

diff --cc net/wireless/scan.c
Simple merge