From patchwork Tue Sep 26 02:02:53 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 727081
Return-Path: <linux-wireless-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
 aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
 by smtp.lore.kernel.org (Postfix) with ESMTP id 3C961E81810
 for <linux-wireless@archiver.kernel.org>;
 Tue, 26 Sep 2023 02:02:59 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
 id S232536AbjIZCDD (ORCPT
 <rfc822;linux-wireless@archiver.kernel.org>);
 Mon, 25 Sep 2023 22:03:03 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35248 "EHLO
 lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
 with ESMTP id S229934AbjIZCDC (ORCPT
 <rfc822;linux-wireless@vger.kernel.org>);
 Mon, 25 Sep 2023 22:03:02 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
 by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65713DF;
 Mon, 25 Sep 2023 19:02:55 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
 s=201702; t=1695693774;
 bh=bbAcJayj1L84857O4FBA8j8oz+LRbSeUOuV7lWJ03ck=;
 h=Date:From:To:Cc:Subject:From;
 b=fgnlhs7nWut1MvXLhBgAoJqVXIe81kmzYC22iwIEMNia+IqF8Srl/2ro+CQd12SdS
 fLwXFuA4bO+MEj/4uUWWw5007o/kO8v47gKzJU3B8YTKa9b523IZA7u03BAzxFHoyA
 VwdsSpav7Lyv4f/P/hZmkxkql491RRgrFotwDplBHZEt61Gu7iWW/jOULexpnZBlHj
 dEdQtKeuk3Lz/RXKfT3eHOQCr1ien/bQGXca/aMzsovtHCvpdeNTf4XpmBbqKPHcvX
 Hp2cNF+h1KSJMOK7hWXmyDBo+3fgfkmjTnr8kz3ZzcI3zKDm3gBZz0tHILcT2IvC+B
 FPSjNhYqKjsfg==
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits)
 server-digest SHA256) (No client certificate requested)
 by mail.ozlabs.org (Postfix) with ESMTPSA id 4Rvjgf01Ttz4xP9;
 Tue, 26 Sep 2023 12:02:53 +1000 (AEST)
Date: Tue, 26 Sep 2023 12:02:53 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kalle Valo <kvalo@kernel.org>, Johannes Berg <johannes@sipsolutions.net>,
 Wireless <linux-wireless@vger.kernel.org>
Cc: Johannes Berg <johannes.berg@intel.com>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the wireless-next tree with the
 wireless tree
Message-ID: <20230926120253.4f1e5730@canb.auug.org.au>
MIME-Version: 1.0
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

Hi all,

Today's linux-next merge of the wireless-next tree got conflicts in:

  net/mac80211/cfg.c

between commit:

  31db78a4923e ("wifi: mac80211: fix potential key use-after-free")

from the wireless tree and commit:

  4d3acf4311a0 ("wifi: mac80211: remove sta_mtx")

from the wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc net/mac80211/cfg.c
index 0e3a1753a51c,5bc6b1329465..000000000000
--- a/net/mac80211/cfg.c