]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7d528ea f7e6003)
Merge wireless into wireless-next
authorJohannes Berg <johannes.berg@intel.com>
Wed, 7 Jun 2023 17:43:52 +0000 (19:43 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 7 Jun 2023 17:49:36 +0000 (19:49 +0200)
commit10f5ae21940cc754f82828d81b8009f2e8ae2c64
tree8156f045504a2f9e1d767b0af6f89b19a4de2e52tree | snapshot
parent7d528eafc5290bed18551a22ff25ce8587b603e0commit | diff
parentf7e60032c6618dfd643c7210d5cba2789e2de2e2commit | diff
Merge wireless into wireless-next

There are a number of upcoming things in both the stack and
drivers that would otherwise conflict, so merge wireless to
wireless-next to be able to avoid those conflicts.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
27 files changed:
drivers/net/wireless/intel/iwlwifi/fw/acpi.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/fw/dbg.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/fw.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/link.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/sta.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/tx.c diff1 | diff2 | blob | history
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h diff1 | diff2 | blob | history
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c diff1 | diff2 | blob | history
drivers/net/wireless/realtek/rtw88/mac80211.c diff1 | diff2 | blob | history
drivers/net/wireless/realtek/rtw88/sdio.c diff1 | diff2 | blob | history
drivers/net/wireless/realtek/rtw89/core.c diff1 | diff2 | blob | history
drivers/net/wireless/realtek/rtw89/mac.c diff1 | diff2 | blob | history
drivers/net/wireless/realtek/rtw89/mac.h diff1 | diff2 | blob | history
drivers/net/wireless/realtek/rtw89/mac80211.c diff1 | diff2 | blob | history
drivers/net/wireless/realtek/rtw89/rtw8852b.c diff1 | diff2 | blob | history
drivers/net/wireless/virtual/mac80211_hwsim.c diff1 | diff2 | blob | history
net/mac80211/cfg.c diff1 | diff2 | blob | history
net/mac80211/chan.c diff1 | diff2 | blob | history
net/mac80211/ieee80211_i.h diff1 | diff2 | blob | history
net/mac80211/mlme.c diff1 | diff2 | blob | history
net/mac80211/tx.c diff1 | diff2 | blob | history
net/mac80211/util.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.