Re: linux-next: manual merge of the staging tree with the staging.current tree

[Greg KH]

On Tue, Jul 28, 2026 at 06:39:16PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/rtl8723bs/core/rtw_wlan_util.c
> 
> between commit:
> 
>   ae21407350151 ("staging: rtl8723bs: fix OOB read in WMM_param_handler()")
> 
> from the staging.current tree and commit:
> 
>   6e68c64a71f70 ("staging: rtl8723bs: remove unnecessary parentheses")
> 
> from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> diff --cc drivers/staging/rtl8723bs/core/rtw_wlan_util.c
> index c614c0b4c792d,8b0502a1881b5..0000000000000
> --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
> @@@ -666,13 -665,10 +665,13 @@@ int WMM_param_handler(struct adapter *p
>   		return false;
>   	}
>   
>  +	if (pIE->length != WLAN_WMM_LEN)
>  +		return false;
>  +
> - 	if (!memcmp(&(pmlmeinfo->WMM_param), (pIE->data + 6), sizeof(struct WMM_para_element)))
> + 	if (!memcmp(&pmlmeinfo->WMM_param, (pIE->data + 6), sizeof(struct WMM_para_element)))
>   		return false;
>   
> - 	memcpy(&(pmlmeinfo->WMM_param), (pIE->data + 6), sizeof(struct WMM_para_element));
> + 	memcpy(&pmlmeinfo->WMM_param, (pIE->data + 6), sizeof(struct WMM_para_element));
>   
>   	pmlmeinfo->WMM_enable = 1;
>   	return true;



Looks good, thanks!

greg k-h