Merge 5.15-rc6 into staging-next

We need the staging fixes in here as well.

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

diff --cc drivers/staging/r8188eu/hal/hal_intf.c
index 4e4f4d1,f27eba7..fee3a59
--- 1/drivers/staging/r8188eu/hal/hal_intf.c
--- 2/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@@ -46,9 -245,10 +46,9 @@@ void rtw_hal_update_ra_mask(struct adap
        struct mlme_priv *pmlmepriv = &adapt->mlmepriv;
  
        if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
 -#ifdef CONFIG_88EU_AP_MODE
                struct sta_info *psta = NULL;
                struct sta_priv *pstapriv = &adapt->stapriv;
-               if ((mac_id - 1) > 0)
+               if (mac_id >= 2)
                        psta = pstapriv->sta_aid[(mac_id - 1) - 1];
                if (psta)
                        add_RATid(adapt, psta, 0);/* todo: based on rssi_level*/

diff --cc drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
Simple merge