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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 21 Oct 2025 09:20:01 +1100

Hi all,

On Tue, 16 Sep 2025 12:23:24 +0100 Mark Brown <[email-masked]> wrote:
>
> Today's linux-next merge of the iwlwifi-next tree got a conflict in:
> 
>   drivers/net/wireless/intel/iwlwifi/fw/runtime.h
> 
> between commit:
> 
>   7bf2dfccc2dd7 ("wifi: iwlwifi: acpi: check DSM func validity")
> 
> from the origin tree and commit:
> 
>   db29d6fd9cac3 ("wifi: iwlwifi: fix remaining kernel-doc warnings")
> 
> from the iwlwifi-next tree.
> 
> 
> diff --cc drivers/net/wireless/intel/iwlwifi/fw/runtime.h
> index 806f9bcdf4f50,8e858e6b3ce38..0000000000000
> --- a/drivers/net/wireless/intel/iwlwifi/fw/runtime.h
> +++ b/drivers/net/wireless/intel/iwlwifi/fw/runtime.h
> @@@ -113,10 -116,23 +116,27 @@@ struct iwl_txf_iter_data 
>    * @phy_filters: specific phy filters as read from WPFC BIOS table
>    * @ppag_bios_rev: PPAG BIOS revision
>    * @ppag_bios_source: see &enum bios_source
>  + * @acpi_dsm_funcs_valid: bitmap indicating which DSM values are valid,
>  + *	zero (default initialization) means it hasn't been read yet,
>  + *	and BIT(0) is set when it has since function 0 also has this
>  + *	bitmap and is always supported
> +  * @geo_enabled: WGDS table is present
> +  * @geo_num_profiles: number of geo profiles
> +  * @geo_rev: geo profiles table revision
> +  * @ppag_chains: PPAG table data
> +  * @ppag_flags: PPAG flags
> +  * @reduced_power_flags: reduced power flags
> +  * @sanitize_ctx: context for dump sanitizer
> +  * @sanitize_ops: dump sanitizer ops
> +  * @sar_chain_a_profile: SAR chain A profile
> +  * @sar_chain_b_profile: SAR chain B profile
> +  * @sgom_enabled: SGOM enabled
> +  * @sgom_table: SGOM table
> +  * @timestamp: timestamp marker data
> +  * @timestamp.wk: timestamp marking worker
> +  * @timestamp.seq: timestamp marking sequence
> +  * @timestamp.delay: timestamp marking worker delay
> +  * @tpc_enabled: TPC enabled
>    */
>   struct iwl_fw_runtime {
>   	struct iwl_trans *trans;

This is now a conflict between the iwlwifi tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell