linux-kernel - Re: linux-next: manual merge of the iwlwifi-next tree with Linus' 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <f53576b21774ab6ba8294c5d1954f0528764f2fb.camel@sipsolutions.net>
Date: Tue, 06 May 2025 08:26:31 +0200
From: Johannes Berg <johannes@...solutions.net>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Miriam Rachel Korenblit
	 <miriam.rachel.korenblit@...el.com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the iwlwifi-next tree with Linus'
 tree

Hi Stephen,

> Today's linux-next merge of the iwlwifi-next tree got conflicts in:
> 
>   drivers/net/wireless/intel/iwlwifi/cfg/sc.c
>   drivers/net/wireless/intel/iwlwifi/iwl-config.h
>   drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
>   drivers/net/wireless/intel/iwlwifi/iwl-trans.c
>   drivers/net/wireless/intel/iwlwifi/iwl-trans.h
>   drivers/net/wireless/intel/iwlwifi/pcie/drv.c
>   drivers/net/wireless/intel/iwlwifi/tests/devinfo.c
> 
> between various commits from Linus' tree and various commits from the
> iwlwifi-next tree.

Yeah, no surprise, there were some reverts in this area. The good thing
is that we also already fixed the bugs that necessitated the reverts
differently, so (eventually, need to check how much is in there now)
this will just be "take next".

> At least one of the commits in Linus' tree is duplicated in the
> iwlwifi-next tree.

Right, saw your other mail too, we'll see what happened and drop those.

Thanks!

johannes