Hi, resending this with a small fix to one of the pacthes Johannes Berg (13): wifi: iwlwifi: clean up config macro wifi: iwlwifi: remove TH/TH1 RF types wifi: iwlwifi: unify some configurations wifi: iwlwifi: pcie: add entry for Killer AX1650i on AdL-P wifi: iwlwifi: tests: check for device names wifi: iwlwifi: cfg: remove fw_name_mac wifi: iwlwifi: cfg: unify Qu/QuZ configs wifi: iwlwifi: cfg: unify Killer 1650s/i with Qu/Hr wifi: iwlwifi: cfg: remove unused config externs wifi: iwlwifi: cfg: remove max_tx_agg_size wifi: iwlwifi: cfg: remove iwl_ax201_cfg_qu_hr wifi: iwlwifi: cfg: remove duplicated iwl_cfg_gl wifi: iwlwifi: cfg: remove duplicated Sc device configs Miri Korenblit (1): wifi: iwlwifi: remove duplicated line Somashekhar Puttagangaiah (1): wifi: iwlwifi: pcie: Add support for new device ids drivers/net/wireless/intel/iwlwifi/Makefile | 3 + .../net/wireless/intel/iwlwifi/cfg/22000.c | 208 +-- .../net/wireless/intel/iwlwifi/cfg/ax210.c | 3 +- drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 9 - drivers/net/wireless/intel/iwlwifi/cfg/dr.c | 2 - drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 12 +- .../net/wireless/intel/iwlwifi/iwl-config.h | 34 +- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 56 +- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 5 - drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 1205 ++++++++--------- .../wireless/intel/iwlwifi/tests/devinfo.c | 12 + 11 files changed, 617 insertions(+), 932 deletions(-) --- v2: remove pointless SUBDEV(IWL_CFG_ANY) -- 2.34.1