From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Johannes Berg <johannes@sipsolutions•net>
Cc: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel•com>,
David Miller <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>,
Johannes Berg <johannes.berg@intel•com>,
Networking <netdev@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Wireless <linux-wireless@vger•kernel.org>
Subject: Re: linux-next: manual merge of the iwlwifi-next tree with the net tree
Date: Fri, 5 Sep 2025 15:08:00 +1000 [thread overview]
Message-ID: <20250905150800.08c5402f@canb.auug.org.au> (raw)
In-Reply-To: <20250903121032.744f5a30@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1737 bytes --]
Hi all,
On Wed, 3 Sep 2025 12:10:32 +1000 Stephen Rothwell <sfr@canb•auug.org.au> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2025-09-05 5:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-03 2:10 linux-next: manual merge of the iwlwifi-next tree with the net tree Stephen Rothwell
2025-09-05 5:08 ` 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=20250905150800.08c5402f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=johannes.berg@intel$(echo .)com \
--cc=johannes@sipsolutions$(echo .)net \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=miriam.rachel.korenblit@intel$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(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