linux-kernel - Re: linux-next: manual merge of the wireless-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: <287ad9eeb94f1e326c22fdcb74c94ef3fde84115.camel@sipsolutions.net>
Date: Wed, 09 Oct 2024 10:30:12 +0200
From: Johannes Berg <johannes@...solutions.net>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>, Kalle Valo <kvalo@...nel.org>, 
 Al Viro <viro@...iv.linux.org.uk>, Wireless
 <linux-wireless@...r.kernel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Tree Davies <tdavies@...kphysics.net>
Subject: Re: linux-next: manual merge of the wireless-next tree with Linus'
 tree

On Wed, 2024-10-09 at 09:27 +0200, Greg Kroah-Hartman wrote:
> > 
> > I can push out the net-next merge (& revert) soon, and then it'll all be
> > cleaner?
> 
> Sure, I'll wait, just let me know what commit to merge at, from what
> tree, whenever you have it ready.
> 

I've done all that now, so you could merge wireless-next/main up to its
head, which right now is a0efa2f362a6 ("Merge net-next/main to resolve
conflicts").

johannes