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

Message-ID: <2024100941-gulp-tasty-f969@gregkh>
Date: Wed, 9 Oct 2024 11:24:12 +0200
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: Johannes Berg <johannes@...solutions.net>
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, Oct 09, 2024 at 10:30:12AM +0200, Johannes Berg wrote:
> 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").

Sure, will do so now.  That branch has a lot of non-staging stuff in it
but git can figure it out when it's all merged together so all is good!

thanks,

greg k-h