Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next

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

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

diff --cc drivers/net/wireless/iwlwifi/dvm/rs.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-drv.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mvm.h
index 1c6476eac496759321b13678194fbef41411a8f5,c7409f159a36bf9d28314811b9d4a9fe64d42527..c6ba553845cd129f2ddef5cf1e1727dd9ca64a18
--- 1/drivers/net/wireless/iwlwifi/mvm/mvm.h
--- 2/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@@ -459,9 -458,9 +459,10 @@@ struct iwl_mvm 
        struct ieee80211_vif *p2p_device_vif;
  
  #ifdef CONFIG_PM_SLEEP
+       struct wiphy_wowlan_support wowlan;
        int gtk_ivlen, gtk_icvlen, ptk_ivlen, ptk_icvlen;
  #ifdef CONFIG_IWLWIFI_DEBUGFS
 +      u32 d3_wake_sysassert; /* must be u32 for debugfs_create_bool */
        bool d3_test_active;
        bool store_d3_resume_sram;
        void *d3_resume_sram;

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