From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel•com>,
Johannes Berg <johannes@sipsolutions•net>
Cc: Mark Brown <broonie@kernel•org>,
Johannes Berg <johannes.berg@intel•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the iwlwifi-next tree with the origin tree
Date: Tue, 21 Oct 2025 09:20:01 +1100 [thread overview]
Message-ID: <20251021092001.6ebae622@canb.auug.org.au> (raw)
In-Reply-To: <aMlIrHaHOu0a8WGG@sirena.org.uk>
[-- 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 --]
prev parent reply other threads:[~2025-10-20 22:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251021092001.6ebae622@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@kernel$(echo .)org \
--cc=johannes.berg@intel$(echo .)com \
--cc=johannes@sipsolutions$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miriam.rachel.korenblit@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox