From: Kalle Valo <kvalo@adurom.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jakub Kicinski <kuba@kernel.org>,
Johannes Berg <johannes.berg@intel.com>,
Johannes Berg <johannes@sipsolutions.net>,
Wireless <linux-wireless@vger.kernel.org>,
David Miller <davem@davemloft.net>,
Ilan Peer <ilan.peer@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the wireless-next tree with Linus' tree
Date: Wed, 26 Oct 2022 17:50:50 +0300 [thread overview]
Message-ID: <874jvqy6yd.fsf@kernel.org> (raw)
In-Reply-To: <87ilk6y7nv.fsf@kernel.org> (Kalle Valo's message of "Wed, 26 Oct 2022 17:35:32 +0300")
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
next prev parent reply other threads:[~2022-10-26 15:23 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-19 16:23 linux-next: manual merge of the wireless-next tree with Linus' tree Stephen Rothwell
2022-10-19 23:23 ` Jakub Kicinski
2022-10-19 17:14 ` Stephen Rothwell
2022-10-19 23:52 ` Jakub Kicinski
2022-10-26 12:40 ` Kalle Valo
2022-10-26 14:35 ` Kalle Valo
2022-10-26 14:50 ` Kalle Valo [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-09 0:44 Stephen Rothwell
2024-10-09 6:43 ` Greg Kroah-Hartman
2024-10-09 6:51 ` Johannes Berg
2024-10-09 7:13 ` Greg Kroah-Hartman
2024-10-09 7:19 ` Johannes Berg
2024-10-09 7:27 ` Greg Kroah-Hartman
2024-10-09 8:30 ` Johannes Berg
2024-10-09 9:24 ` Greg Kroah-Hartman
2024-10-09 0:38 Stephen Rothwell
2023-09-26 1:54 Stephen Rothwell
2023-09-26 4:50 ` Greg Kroah-Hartman
2023-09-14 0:28 Stephen Rothwell
2013-07-25 1:37 Stephen Rothwell
2013-01-23 1:16 Stephen Rothwell
2013-01-23 20:18 ` Grumbach, Emmanuel
2011-11-22 3:20 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874jvqy6yd.fsf@kernel.org \
--to=kvalo@adurom.com \
--cc=davem@davemloft.net \
--cc=ilan.peer@intel.com \
--cc=johannes.berg@intel.com \
--cc=johannes@sipsolutions.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.