lkml.org 
[lkml]   [2022]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the wireless-next tree with Linus' tree
Date
Kalle Valo <kvalo@kernel.org> writes:

> Hi Stephen,
>
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>
>> On Wed, 19 Oct 2022 16:23:24 -0700 Jakub Kicinski <kuba@kernel.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?

Never mind, I see it now. Sorry for the noise.

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

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

\
 
 \ /
  Last update: 2022-10-26 17:24    [W:0.052 / U:1.180 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site