* linux-next: manual merge of the iwlwifi-next tree with the net tree
@ 2025-09-03 2:10 Stephen Rothwell
2025-09-05 5:08 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2025-09-03 2:10 UTC (permalink / raw)
To: Miriam Rachel Korenblit, Johannes Berg, David Miller,
Jakub Kicinski, Paolo Abeni
Cc: Johannes Berg, Networking, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1488 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell
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,
[-- Attachment #2: OpenPGP digital signature --]
[-- 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 net tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2025-09-05 5:08 UTC (permalink / raw)
To: Johannes Berg
Cc: Miriam Rachel Korenblit, David Miller, Jakub Kicinski,
Paolo Abeni, Johannes Berg, Networking, Linux Kernel Mailing List,
Linux Next Mailing List, Wireless
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-09-05 5:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox