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: <3d5761da40d0ddf4109d10d6f3c3d2538c4d89d4.camel@sipsolutions.net>
Date: Wed, 07 May 2025 07:37:46 +0200
From: Johannes Berg <johannes@...solutions.net>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Miriam Rachel Korenblit <miriam.rachel.korenblit@...el.com>, 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,

Thanks!

> So, at your suggestion, I just used the latter versions of these files,
> but I then got the following build failure:

Ouch, sorry about that. That sounds like it's due to the duplicate
commits you had pointed out, which Miri dropped from iwlwifi-next now.

On the plus side, I'm going to be the one who has to resolve these
conflicts (soon) :)

> So, today I have merged the iwlwifi-next tree from next-20250505 (which
> was effectively empty).  You may want to try merging the iwlwifi tree
> into the iwlwifi-next tree and resolve any conflicts yourself (now that
> the iwlwifi tree has been merged into Linus' tree).

Not sure what you mean by "iwlwifi tree", I think iwlwifi-next/fixes was
empty, so perhaps you meant "wireless tree" instead?

But yeah, I know what all the code is and what's going on, though
evidently less than I thought after the recent updates.

johannes