linux-next: manual merge of the iwlwifi-next tree with the origin tree
Subsystems (2)
Mark Brown
maintainerHi all,
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.
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.
drivers/net/wireless/intel/iwlwifi/fw/runtime.h +0 -0
@@@ -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;
Hi all,
Quoted 38 lines · On Tue, 16 Sep 2025 12:23:24 +0100 Mark Brown <[email protected]> wrote:
Today's linux-next merge of the iwlwifi-next tree got a conflict in:
drivers/net/wireless/intel/iwlwifi/fw/runtime.hbetween 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.
drivers/net/wireless/intel/iwlwifi/fw/runtime.h +10
-0@@@ -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
drivers/net/wireless/intel/iwlwifi/fw/runtime.h
Quoted 10 lines
drivers/net/wireless/intel/iwlwifi/fw/runtime.h +7
-0+* @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.
Signature · 2 lines
Cheers, Stephen Rothwell