Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
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
References: <20221020032340.5cf101c0@canb.auug.org.au>
        <20221019162324.2baaa7e8@kernel.org>
        <20221020041440.3f6c1e46@canb.auug.org.au> <87ilk6y7nv.fsf@kernel.org>
Date:   Wed, 26 Oct 2022 17:50:50 +0300
In-Reply-To: <87ilk6y7nv.fsf@kernel.org> (Kalle Valo's message of "Wed, 26 Oct
        2022 17:35:32 +0300")
Message-ID: <874jvqy6yd.fsf@kernel.org>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam_score: -2.9
X-Spam_bar: --
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE,
        SPF_NONE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

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