Merge wireless/main into wireless-next/main
authorJohannes Berg <johannes.berg@intel.com>
Fri, 31 Mar 2023 08:51:45 +0000 (10:51 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 31 Mar 2023 09:07:40 +0000 (11:07 +0200)
commit0b354b8b09be37f672ca0f91855f86331d08f1a4
treeeeeab4f3ce62c00828c499b366696aa9889547fe
parentaa2aa818cd1198cfa2498116d57cd9f13fea80e4
parent12b220a6171faf10638ab683a975cadcf1a352d6
Merge wireless/main into wireless-next/main

There are a few merge conflicts due to overlapping
fixes and changes, merge wireless/main to fix them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
drivers/net/wireless/intel/iwlwifi/mvm/ops.c
drivers/net/wireless/intel/iwlwifi/mvm/sta.c
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h
net/mac80211/rx.c
net/mac80211/util.c
net/wireless/nl80211.c