git.maquefel.me Git - linux.git/commit

author	Johannes Berg <johannes.berg@intel.com>
	Thu, 8 Feb 2024 08:57:43 +0000 (09:57 +0100)
committer	Johannes Berg <johannes.berg@intel.com>
	Thu, 8 Feb 2024 08:58:25 +0000 (09:58 +0100)
commit	af4acac7caa17cf10742c80e2dd859e21d06abb9
tree	650468891990d2f8edc6726aab697ff35d8b9673	tree \| snapshot
parent	94dd7ce1885e530a7b10bbe50d5d68ba1bb99e6e	commit \| diff
parent	0647903efbc84b772325b4d24d9487e24d6d1e03	commit \| diff

Merge wireless into wireless-next

There are some changes coming to wireless-next that will
otherwise cause conflicts, pull wireless in first to be
able to resolve that when applying the individual changes
rather than having to do merge resolution later.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

16 files changed:

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/fw/api/debug.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/fw/dbg.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.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/microchip/wilc1000/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/microchip/wilc1000/spi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ti/wlcore/sdio.c	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.c	diff1 \|	diff2 \|	blob \| history
net/wireless/scan.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/fw/api/debug.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/fw/dbg.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.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/microchip/wilc1000/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/microchip/wilc1000/spi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ti/wlcore/sdio.c	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.c	diff1 \|	diff2 \|	blob \| history
net/wireless/scan.c	diff1 \|	diff2 \|	blob \| history