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: <958ec4672d9263d23b1f47d8acd1047037e7ff25.camel@sipsolutions.net>
Date: Wed, 14 May 2025 08:41:35 +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,

> > I keep getting more conflicts in the above files (each time one of them
> > get modified in the iwlwifi-next tree.  Could you please merge commit
> > 
> >  ebedf8b7f05b ("wifi: iwlwifi: add support for Killer on MTL")
> > 
> > or the current net tree
> > (git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main)
> > into the iwlwifi-next tree and fix up the conflicts.  I believe that
> > will clean up all the conflicts - that are really just between bug
> > fixes for iwlwifi and the new development).
> 
> Or, of course, I assume the iwlwifi-next tree will be merged into the
> net-next tree at some point soon ...
> 

Yes, should be really soon now, though into wireless-next. But that's
up-to-date with net, so would resolve all of these issues. In fact that
was the plan all along, it's just been taking a bit longer than
expected, sorry about that.

johannes