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: <20250514125524.1528467f@canb.auug.org.au>
Date: Wed, 14 May 2025 12:55:24 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Johannes Berg <johannes@...solutions.net>
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 all,

On Wed, 14 May 2025 12:41:31 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> 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 ...

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped