Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD

Conflicts:
	drivers/net/wireless/iwlwifi/mvm/ops.c

diff --cc drivers/net/wireless/iwlwifi/mvm/fw-api.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mvm.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/ops.c
index e3f69a0,b29c31a..7998bac
--- 1/drivers/net/wireless/iwlwifi/mvm/ops.c
--- 2/drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/iwlwifi/mvm/ops.c
@@@ -292,7 -292,7 +292,8 @@@ static const char *iwl_mvm_cmd_strings[
        CMD(BT_COEX_PROT_ENV),
        CMD(BT_PROFILE_NOTIFICATION),
        CMD(BT_CONFIG),
+       CMD(MCAST_FILTER_CMD),
 +      CMD(REPLY_BEACON_FILTERING_CMD),
  };
  #undef CMD