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 X-Patchwork-Id: 144681 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp1615994vqu; Mon, 25 Sep 2023 19:03:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGkvx/IXQp+gz1GwUyL2qIMsu50iz3evbJ3GxctkWBvOnfRwUUXFT/YDXqca5FfgzKlyQe4 X-Received: by 2002:a05:6a00:1819:b0:690:25fb:bac1 with SMTP id y25-20020a056a00181900b0069025fbbac1mr8449807pfa.18.1695693830973; Mon, 25 Sep 2023 19:03:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695693830; cv=none; d=google.com; s=arc-20160816; b=Z5PffcTYNDYqLlwsJq4fCRRZmCozbl4T6GpmeYSWxYQbKar/HUWH8NYFmsLwsvaaRh bWbbgfANRTv/Fpu9HtypVdYmUK3jOGNIV/ll8eIF6WHUmZ7hpgD604XzdK6zWIbR/hzs YUzZYoc/HGnMuKL5a26Pr2+jLHjiNxw1FEEBPl5+mz4M6Q2bmBxViNV1BUCywIXkA4cH P2XLDIKGVquBDEKyK+psst1s15D9TSEbO6aOKbSJueSy0Nt3aEUs9pCFQ5Pi95npA1K8 jQL6SdQuZjWi77NoRt1WCc0vFTLIQsLPiapYz+KwnSPFBPGsgsw0bu2n04n/USANSGWb rNwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=bbAcJayj1L84857O4FBA8j8oz+LRbSeUOuV7lWJ03ck=; fh=YSlvpPL42+OV5bLFCL+NbyjIvOHCcshrxbzBHge5Zrw=; b=DSXDyh7fC8BsrKx4BDMBVdQr8VgZ/sIW7AYlDRCENLCzTYAyeJkAfusgx/AFsn1AI4 UwanQgpk/voV6nO4MhnecsPqPrm+7g8dmYe0WTcNAskzEDEiJ6flLGC1WXFNhyw/2Lan +qEqQpLMogVO0yVyOfdp+HXlXnimnuUo2TU9BVCgnVLqltzw8POvZrPBVNuUY/ZoWcBM BJcVFTfdjnm0ZHX2e6GxyW/3ITxT41DGBl7mPhDEWxhqQK4E1i0Dpn9pBtoyQLPs/XB3 +pfLZz65HCZPpQWaGDRE8GEpLHGlFH5+N4XBiMO0+u0ANQaE2deO9UQY5pk5HQw/pWh9 eVGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=fgnlhs7n; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id br4-20020a056a00440400b006880a2ca0fasi10958332pfb.312.2023.09.25.19.03.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 19:03:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=fgnlhs7n; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 762698184E1B; Mon, 25 Sep 2023 19:03:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233046AbjIZCDD (ORCPT + 27 others); 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 ); 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 To: Kalle Valo , Johannes Berg , Wireless Cc: Johannes Berg , Linux Kernel Mailing List , Linux Next Mailing List 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 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,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-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 25 Sep 2023 19:03:12 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778063854608668204 X-GMAIL-MSGID: 1778063854608668204 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