Subject: Re: linux-next: manual merge of the iwlwifi-next tree with the net tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 5 Sep 2025 15:08:00 +1000

Hi all,

On Wed, 3 Sep 2025 12:10:32 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the iwlwifi-next tree got a conflict in:
> 
>   drivers/net/wireless/intel/iwlwifi/fw/uefi.c
> 
> between commit:
> 
>   1d33694462fa ("wifi: iwlwifi: uefi: check DSM item validity")
> 
> from the net tree and commit:
> 
>   f53f2bd8fc5f ("wifi: iwlwifi: uefi: remove runtime check of constant values")
> 
> from the iwlwifi-next 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/net/wireless/intel/iwlwifi/fw/uefi.c
> index 99a17b9323e9,44c7c565d1c6..000000000000
> --- a/drivers/net/wireless/intel/iwlwifi/fw/uefi.c
> +++ b/drivers/net/wireless/intel/iwlwifi/fw/uefi.c
> @@@ -742,17 -744,6 +744,12 @@@ int iwl_uefi_get_dsm(struct iwl_fw_runt
>   		goto out;
>   	}
>   
> - 	if (ARRAY_SIZE(data->functions) != UEFI_MAX_DSM_FUNCS) {
> - 		IWL_DEBUG_RADIO(fwrt, "Invalid size of DSM functions array\n");
> - 		goto out;
> - 	}
> - 
>  +	if (!(data->functions[DSM_FUNC_QUERY] & BIT(func))) {
>  +		IWL_DEBUG_RADIO(fwrt, "DSM func %d not in 0x%x\n",
>  +				func, data->functions[DSM_FUNC_QUERY]);
>  +		goto out;
>  +	}
>  +
>   	*value = data->functions[func];
>   
>   	IWL_DEBUG_RADIO(fwrt,

This is now a conflict between the wireless-next tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell