netdev - Re: linux-next: manual merge of the net-next tree with the wireless 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: <987ecad0840a9d15bd844184ea595aff1f3b9c0c.camel@sipsolutions.net>
Date: Thu, 12 Oct 2023 10:10:10 +0200
From: Johannes Berg <johannes@...solutions.net>
To: Stephen Rothwell <sfr@...b.auug.org.au>, David Miller
 <davem@...emloft.net>,  Jakub Kicinski <kuba@...nel.org>, Paolo Abeni
 <pabeni@...hat.com>, Kalle Valo <kvalo@...nel.org>
Cc: Networking <netdev@...r.kernel.org>, Wireless
	 <linux-wireless@...r.kernel.org>, 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 net-next tree with the wireless
 tree

Hi,

On Thu, 2023-10-12 at 11:37 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   net/mac80211/key.c
> 
> between commit:
> 
>   02e0e426a2fb ("wifi: mac80211: fix error path key leak")
> 
> from the wireless tree and commits:
> 
>   2a8b665e6bcc ("wifi: mac80211: remove key_mtx")
>   7d6904bf26b9 ("Merge wireless into wireless-next")
> 
> from the net-next tree.

Oops, right, I forgot about that.

> I fixed it up (I just used the latter, there may be more needed)

Just using net-next/wireless-next is fine, I actually noticed the issue
while I was merging the trees to fix the previous conflicts here.

Thanks,
johannes