Merge remote-tracking branch 'stable/linux-5.11.y' into zygo-5.11.x-zb64

diff --cc drivers/net/wireless/realtek/rtw88/main.h
index d185209ee3cc5a2c5fa59d772ccf7b438add2d0d,3d51394edb4a32833c645af9666100352bd7856b..98b18daae1fbbbaf059bf708b1ec3e051c955bd1
--- 1/drivers/net/wireless/realtek/rtw88/main.h
--- 2/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@@ -1531,10 -1519,9 +1532,11 @@@ struct rtw_dm_info 
        u8 cck_gi_l_bnd;
  
        u8 tx_rate;
 +      u32 rrsr_val_init;
 +      u32 rrsr_mask_min;
        u8 thermal_avg[RTW_RF_PATH_MAX];
        u8 thermal_meter_k;
+       u8 thermal_meter_lck;
        s8 delta_power_index[RTW_RF_PATH_MAX];
        s8 delta_power_index_last[RTW_RF_PATH_MAX];
        u8 default_ofdm_index;

diff --cc drivers/net/wireless/realtek/rtw88/phy.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtw88/phy.h
Simple merge

diff --cc drivers/net/wireless/realtek/rtw88/reg.h
Simple merge

diff --cc drivers/net/wireless/realtek/rtw88/rtw8822c.c
Simple merge

diff --cc fs/btrfs/ctree.h
Simple merge

diff --cc fs/btrfs/ioctl.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge