Merge tag 'mac80211-next-for-net-next-2021-04-20' of git://git.kernel.org/pub/scm...

Johannes Berg says:

====================
Another set of updates, all over the map:
 * set sk_pacing_shift for 802.3->802.11 encap offload
 * some monitor support for 802.11->802.3 decap offload
 * HE (802.11ax) spec updates
 * userspace API for TDLS HE support
 * along with various other small features, cleanups and
   fixups
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/wireless/ath/ath11k/mac.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
Simple merge

diff --cc drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
Simple merge

diff --cc drivers/net/wireless/mediatek/mt76/mt7915/init.c
Simple merge

diff --cc drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
Simple merge

diff --cc drivers/net/wireless/mediatek/mt76/mt7921/main.c
Simple merge

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

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

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

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