]> www.infradead.org Git - users/hch/block.git/commit
projects / users / hch / block.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 9418edf 22061bf)
Merge wireless into wireless-next
authorJohannes Berg <johannes.berg@intel.com>
Thu, 5 Oct 2023 20:57:34 +0000 (22:57 +0200)
committerKalle Valo <kvalo@kernel.org>
Fri, 6 Oct 2023 14:08:47 +0000 (17:08 +0300)
commit7d6904bf26b96ef087514cb7a8c50b62a4911c99
tree2feaff8495d88c2102dc2e017b7afc5c58db02d6tree
parent9418edf8ff01e7a4904aac1aca4864ecdea37593commit | diff
parent22061bfc57fe08c77141dc876b4af75603c4d61dcommit | diff
Merge wireless into wireless-next

Resolve several conflicts, mostly between changes/fixes in
wireless and the locking rework in wireless-next. One of
the conflicts actually shows a bug in wireless that we'll
want to fix separately.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
17 files changed:
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/fw.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/tx.c diff1 | diff2 | blob | history
include/net/cfg80211.h diff1 | diff2 | blob | history
net/mac80211/cfg.c diff1 | diff2 | blob | history
net/mac80211/ibss.c diff1 | diff2 | blob | history
net/mac80211/ieee80211_i.h diff1 | diff2 | blob | history
net/mac80211/key.c diff1 | diff2 | blob | history
net/mac80211/mesh.c diff1 | diff2 | blob | history
net/mac80211/mlme.c diff1 | diff2 | blob | history
net/mac80211/tx.c diff1 | diff2 | blob | history
net/wireless/core.c diff1 | diff2 | blob | history
net/wireless/core.h diff1 | diff2 | blob | history
net/wireless/mlme.c diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history
net/wireless/scan.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.