linux-kernel - linux-next: manual merge of the wireless-next tree with the wireless tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250716135252.51125baa@canb.auug.org.au>
Date: Wed, 16 Jul 2025 13:52:52 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Kalle Valo <kvalo@...nel.org>, Johannes Berg <johannes@...solutions.net>
Cc: Wireless <linux-wireless@...r.kernel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Miri Korenblit
 <miriam.rachel.korenblit@...el.com>, Pagadala Yesu Anjaneyulu
 <pagadala.yesu.anjaneyulu@...el.com>
Subject: linux-next: manual merge of the wireless-next tree with the
 wireless tree

Hi all,

Today's linux-next merge of the wireless-next tree got conflicts in:

  drivers/net/wireless/intel/iwlwifi/fw/regulatory.c
  drivers/net/wireless/intel/iwlwifi/mld/regulatory.c

between commit:

  5fde0fcbd760 ("wifi: iwlwifi: mask reserved bits in chan_state_active_bitmap")

from the wireless tree and commit:

  ea045a0de3b9 ("wifi: iwlwifi: add support for accepting raw DSM tables by firmware")

from the wireless-next tree.

I fixed it up (I just used the latter) 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

Content of type "application/pgp-signature" skipped