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]

Date:   Wed, 26 Oct 2022 17:35:32 +0300
From:   Kalle Valo <kvalo@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Jakub Kicinski <kuba@...nel.org>,
        Johannes Berg <johannes.berg@...el.com>,
        Johannes Berg <johannes@...solutions.net>,
        Wireless <linux-wireless@...r.kernel.org>,
        David Miller <davem@...emloft.net>,
        Ilan Peer <ilan.peer@...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 wireless-next tree with Linus' tree

Hi Stephen,

Stephen Rothwell <sfr@...b.auug.org.au> writes:

> On Wed, 19 Oct 2022 16:23:24 -0700 Jakub Kicinski <kuba@...nel.org> wrote:
>>
>> On Thu, 20 Oct 2022 03:23:40 +1100 Stephen Rothwell wrote:
>> > Today's linux-next merge of the wireless-next tree got a conflict in:
>> > 
>> >   net/mac80211/util.c
>> > 
>> > between commit:
>> > 
>> >   ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")
>> > 
>> > from the origin tree and commit:
>> > 
>> >   ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")  
>
> This should have been commit
>
>   45ebac4f059b ("wifi: mac80211: Parse station profile from association response")

BTW I have been trying to reproduce this conflict to no avail, do you
still see it?

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches