Subject: Re: linux-next: manual merge of the iwlwifi-next tree with Linus' tree

From: Johannes Berg <[email-masked]>
Date: Tue, 06 May 2025 08:26:31 +0200

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