* linux-next: manual merge of the iwlwifi-next tree with the origin tree
@ 2025-09-16 11:23 Mark Brown
2025-10-20 22:20 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2025-09-16 11:23 UTC (permalink / raw)
To: Miriam Rachel Korenblit, Johannes Berg
Cc: Johannes Berg, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2202 bytes --]
Hi 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.
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;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the iwlwifi-next tree with the origin tree
2025-09-16 11:23 linux-next: manual merge of the iwlwifi-next tree with the origin tree Mark Brown
@ 2025-10-20 22:20 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2025-10-20 22:20 UTC (permalink / raw)
To: Miriam Rachel Korenblit, Johannes Berg
Cc: Mark Brown, Johannes Berg, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2101 bytes --]
Hi all,
On Tue, 16 Sep 2025 12:23:24 +0100 Mark Brown <broonie@kernel•org> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-10-20 22:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-16 11:23 linux-next: manual merge of the iwlwifi-next tree with the origin tree Mark Brown
2025-10-20 22:20 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox