linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <20250506114402.2f440664@canb.auug.org.au>
Date: Tue, 6 May 2025 11:44:02 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Miriam Rachel Korenblit <miriam.rachel.korenblit@...el.com>, Johannes
 Berg <johannes@...solutions.net>
Cc: Johannes Berg <johannes.berg@...el.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the iwlwifi-next tree with Linus' tree

Hi all,

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.

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

I couldn't figure out how to fix it up, so I dropped the iwlwifi tree
for today.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped