Merge 5.5-rc3 into staging-next

We need the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/wfx/sta.c
index 3296bc3521d5254f63b0008344925bb5e804a9b6,471dd15b227fe7a9b3107ff6b3102ed4e0d16869..9a61478d98f89c35af1ab41e0cb0e7f304fd576f
--- 1/drivers/staging/wfx/sta.c
--- 2/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@@ -1397,12 -1569,8 +1397,13 @@@ int wfx_add_interface(struct ieee80211_
        INIT_WORK(&wvif->bss_params_work, wfx_bss_params_work);
        INIT_WORK(&wvif->set_cts_work, wfx_set_cts_work);
        INIT_WORK(&wvif->unjoin_work, wfx_unjoin_work);
 +      INIT_WORK(&wvif->tx_policy_upload_work, wfx_tx_policy_upload_work);
 +
 +      mutex_init(&wvif->scan_lock);
 +      init_completion(&wvif->scan_complete);
 +      INIT_WORK(&wvif->scan_work, wfx_hw_scan_work);
  
+       INIT_WORK(&wvif->tx_policy_upload_work, wfx_tx_policy_upload_work);
        mutex_unlock(&wdev->conf_mutex);
  
        hif_set_macaddr(wvif, vif->addr);