Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp834997rwi; Wed, 26 Oct 2022 07:48:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5SpoY0AgBdpTLrZBgEMeKdx9GFjdhZocJooecaGNXx2O4XpDqa6NbtMBN74xuGE2tMF5bZ X-Received: by 2002:a63:6a03:0:b0:43a:18ce:7473 with SMTP id f3-20020a636a03000000b0043a18ce7473mr39527575pgc.616.1666795708994; Wed, 26 Oct 2022 07:48:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666795708; cv=none; d=google.com; s=arc-20160816; b=UH5Nw9pettrdig4CP+ElJ9jwoNjqgFa5H1xguW93uDwn4dqugaEKnBYz42n0bb3NtS DQZk7hqL7V7KG407ZRKtkpCCK3jahUUnE+bM2ZpqQf0Obcm5e/ob0F2SV6VL3Z1A6TPB pSGD5f0/5ImE4mVG1sXkoxeKAkZ7odEQLRDXTO66LDN3kmZ4CNfk4lpHvVTM8KyujYit mUuAUIODmDenwt9u2oNNSQLNmSeTAqOPE0Ba0TPGQdDSJtmLRtvKsXnTdCyize2fxLUG +0l0ZKO4Fs6CLEIgDCoVXu66ynrWmK/ULYQcGmuw2LFkDUATCfII1vLU1Z0IjnzcBjRp x+WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:user-agent:message-id:in-reply-to :date:references:subject:cc:to:from:dkim-signature; bh=2Xy80XfLrUjRJ9Rib9shdZbQyRPlFsSJRDgmB7+TadM=; b=PHA2f1cLR1aacEyl4A8C0gV8Skby2MjtKUpC+Qigy4z4dpnNTDNUNj61oXNytfGyVB zhmbqW0UXoxBVMRbdk1/nuvFqen+c9Mem2HatdLhkXDieg1erXReiR0ygNYYI3r+ciIP gHribE4QMveF+d3YpuavS0J+LDIcFms13YO/jTKhBfcHJKAR+au8dVV69pt8tnoNeCoU 1L8eV8djDOkDe9xgHlYMUIQFqfbmHCcKQVsL9sSlpbzwEpvuHR4GXuTSHyT38Y7bEMGl ZZ4c1mqfKUDOT4TI/Cpl50pXO3y3jRvdm8LiFCM8TpGoKJGKPPEa7/xNRZJ4oAq2Bkpl QeuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BIE8ohky; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jg13-20020a17090326cd00b00179ec1d9eb4si6391209plb.112.2022.10.26.07.48.15; Wed, 26 Oct 2022 07:48:28 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BIE8ohky; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234331AbiJZOfq (ORCPT + 65 others); Wed, 26 Oct 2022 10:35:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234078AbiJZOfo (ORCPT ); Wed, 26 Oct 2022 10:35:44 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F17E3491C4; Wed, 26 Oct 2022 07:35:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id AC792B822B5; Wed, 26 Oct 2022 14:35:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 971E6C433D6; Wed, 26 Oct 2022 14:35:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666794940; bh=x+48O7cslOovb4alCfajPAHTVBLIpgxGIG/BjNakEuU=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=BIE8ohkyArcywM2fFtNX6bxnFoOap0OB1HrpR+gZ8DrvimZfqgQdzCvciO0oY9vVB Nx9RhsEGgzooFcKyAqSrmpVq/RFpY1nR+hFxWOO7N7RTCi2cN18yCJ1v2o51uBVlo9 CV5AixzaizXMQeMKmuXBm7MBlzalmajrliWCYk9zVZK8MzjAS4T6ctxbnFmUIWDAWF 9GOrYE8+6EX7GpBpldkBFhQIbZwARlNZrCc1OdbtGtHzP93463DLg6eS3U1wLy51nt HHBw/CeuXgkzrRj99RuGIWpsRCfKxUUa9Mi6Eo2L8NimV9oKr17Jn04NifBSwrE17c BuV+GXrKDVYyw== From: Kalle Valo To: Stephen Rothwell Cc: Jakub Kicinski , Johannes Berg , Johannes Berg , Wireless , David Miller , Ilan Peer , Linux Kernel Mailing List , Linux Next Mailing List 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> Date: Wed, 26 Oct 2022 17:35:32 +0300 In-Reply-To: <20221020041440.3f6c1e46@canb.auug.org.au> (Stephen Rothwell's message of "Thu, 20 Oct 2022 04:14:40 +1100") Message-ID: <87ilk6y7nv.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-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-wireless@vger.kernel.org Hi Stephen, Stephen Rothwell writes: > On Wed, 19 Oct 2022 16:23:24 -0700 Jakub Kicinski 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