linux-kernel - Re: 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 for Android: free password hash cracker in your pocket

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

Message-ID: <4ee6758a49e6f01c5e42b2f7c27aff905ac07dfa.camel@sipsolutions.net>
Date: Wed, 16 Jul 2025 10:59:31 +0200
From: Johannes Berg <johannes@...solutions.net>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Kalle Valo <kvalo@...nel.org>
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: Re: linux-next: manual merge of the wireless-next tree with the
 wireless tree

On Wed, 2025-07-16 at 13:52 +1000, Stephen Rothwell wrote:
> 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.
> 

Thanks for the heads-up.

I'll double-check, and give Jakub a heads-up, he's probably going to hit
this, unless I defer the wireless-next pull request. We'll figure it
out.

I also just noticed that you're still sending this to Kalle - he stepped
down as maintainer earlier this year, so you should probably change the
contact for the wireless/wireless-next trees to just me.

Thanks,
johannes