git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Jakub Kicinski
authored
Cross-merge networking fixes after downstream PR. Conflicts: net/mac80211/rx.c 91535613 ("wifi: mac80211: don't drop all unprotected public action frames") 6c02fab7 ("wifi: mac80211: split ieee80211_drop_unencrypted_mgmt() return value") Adjacent changes: drivers/net/ethernet/apm/xgene/xgene_enet_main.c 61471264 ("net: ethernet: apm: Convert to platform remove callback returning void") d2ca43f3 ("net: xgene: Fix unused xgene_enet_of_match warning for !CONFIG_OF") net/vmw_vsock/virtio_transport.c 64c99d2d ("vsock/virtio: support to send non-linear skb") 53b08c49 ("vsock/virtio: initialize the_virtio_vsock before using VQs") Signed-off-by:Jakub Kicinski <kuba@kernel.org>