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: <317aeb02110105be1483d13c204bfb48d4d19c61.camel@sipsolutions.net>
Date: Wed, 09 Oct 2024 08:51:22 +0200
From: Johannes Berg <johannes@...solutions.net>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Stephen Rothwell
	 <sfr@...b.auug.org.au>
Cc: 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 08:43 +0200, Greg Kroah-Hartman wrote:
> 
> Johannes, any objection if I just pull in your wireless-next tree into
> my staging-next branch so that we don't get these issues going forward?
> 
> It's not going to be rebased, right?
> 

It's not.

However, Stephen also reported a build failure that you don't want to
pull in, so you can either

 * pull in commit 836265d31631 ("wifi: remove iw_public_data from struct
   net_device") from before the build failure,

 * pull in commit 4991d2e7ad38 ("staging: don't recommend using
   lib80211") which is really all you care about (both staging
   patches I had are included at that point), or

 * give me an hour or so to revert commit aee809aaa2d1 ("wifi: cfg80211:
   unexport wireless_nlevent_flush()") which caused a build failure.


But if the conflict is to Linus's tree, is that even going to help?
Seems like I should pull in -rc2 and solve this one and the ks7010 one
that way? Just need to check with net-next?

johannes