Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp1173890rdg; Wed, 11 Oct 2023 17:37:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG7883St9PJHR4A33wfhsh1geu/8DAC8nK+1Tk0e+SNuldZOk5vs6QsgFPrvZFncWAT3JWE X-Received: by 2002:a05:6a20:3d1b:b0:12e:4d86:c017 with SMTP id y27-20020a056a203d1b00b0012e4d86c017mr27969763pzi.10.1697071059179; Wed, 11 Oct 2023 17:37:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697071059; cv=none; d=google.com; s=arc-20160816; b=ompaaKNbGOoDnoi7gZh0/3J2b3YXib/w+xs/S4y1Q+bkln96DHrxAtBFMIUPZG4rcW Pr6y/LEtgU7tX3uzv91MpU42f0IEYXnA/17If+CpiSZr+eom8YNsFAoJOOASaYKnob3/ cJimRVLRWcA9gJIURZe9BS50B75TtdLe7nYLke6ql7SrCMkD/M1aYWBc7mdSEJYlnakF UF2977vP3MSrNzd9WjwgOTYOwzjW1w6zjucR7hmYNtX4eVPsf6uoZYO9+WsanByS7Gkf 3JQqTRveX/RIW1e6mnmLcw8b/h2+pH/vON5vXwgcW0OAT5dfsyJVBdt6JAoWPYca9xOZ Cduw== 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=d0eWK5n2+GWr3yid0IrdcGPcamDTbmkULf2jKU9FMh4=; fh=0AapYfsA+jM/+lyxAyurZfGknQZHp7ztK6N0lqS5mKQ=; b=ZTVeVN6Hl7bjrdsF6qkJ7Wuq7VjssyBha6OpiL2YwNW9eGo2TCtThnZkQrUpL44vey 2Ef6/ODTCCUfp1r76EJQif1Ux4Ub0EOz7PKGZ0DXnBnv3RZkDZB0QDtTcgk10grOhf5y 0qLc3Gu/qsUVhaVZYl/wIEm0ZXSDMDTR9+4YNpltJROoNk2pwyMuUxpUH0Ev0AdYYxv1 4EGv4Gdmo08wRVTYKZpA02DX/gXNYnj16UGxOgceH0lRviNq52Ig5MpbmEiPjwoToPUo 0OPokneHvJWYHoBYfggL+d8zm2CAJFQvtyzuZ8TCTTVwDCLfait1cszW9HXLNcIydAuk gOSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=J7MKxLij; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Return-Path: Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id t2-20020a170902e84200b001c60ee5a9dcsi850550plg.428.2023.10.11.17.37.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 17:37:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=J7MKxLij; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-wireless-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 groat.vger.email (Postfix) with ESMTP id 12CFA8122885; Wed, 11 Oct 2023 17:37:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235230AbjJLAhb (ORCPT + 52 others); Wed, 11 Oct 2023 20:37:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233886AbjJLAha (ORCPT ); Wed, 11 Oct 2023 20:37:30 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 833F698; Wed, 11 Oct 2023 17:37:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1697071043; bh=d0eWK5n2+GWr3yid0IrdcGPcamDTbmkULf2jKU9FMh4=; h=Date:From:To:Cc:Subject:From; b=J7MKxLij/7k8M7iY9b6lnoDEYzdYn6acQA2nURqomPEU62BxrerraaAHhMuhLWHJJ QDUnvexRjR/MWFe89JHnFbKsWuaOp030cDQ4DMkUVnvxQMob+z+BHCXyFL2tPOR3JV 5i2loRNYD1e0u6czG01uM0bnkaEehAr2HqgQ5VmH8rIM3ep2qJ1mcskWX4gh3PHEgy 07kdcXWhn9acQbMOCpw3i2a5ALnhr0zMxpD4pqIQVrUsRbWREfDgI6XlaoO4wG+gN+ G7IFnufOWJacFiws7WQ8dJd9/t+77gFsYhoJ7cLXNhVUtQVfInKbcgUsLdmwaNgpfj yrMF2WXuKlAHA== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4S5W1Y66qDz4xWb; Thu, 12 Oct 2023 11:37:21 +1100 (AEDT) Date: Thu, 12 Oct 2023 11:37:21 +1100 From: Stephen Rothwell To: David Miller , Jakub Kicinski , Paolo Abeni , Kalle Valo , Johannes Berg Cc: Networking , Wireless , Johannes Berg , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the net-next tree with the wireless tree Message-ID: <20231012113648.46eea5ec@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/wof5tWYoXT/+z+takc=pVNJ"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 11 Oct 2023 17:37:33 -0700 (PDT) X-Spam-Level: ** --Sig_/wof5tWYoXT/+z+takc=pVNJ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/mac80211/key.c between commit: 02e0e426a2fb ("wifi: mac80211: fix error path key leak") from the wireless tree and commits: 2a8b665e6bcc ("wifi: mac80211: remove key_mtx") 7d6904bf26b9 ("Merge wireless into wireless-next") from the net-next tree. I fixed it up (I just used the latter, there may be more needed) 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. --=20 Cheers, Stephen Rothwell --Sig_/wof5tWYoXT/+z+takc=pVNJ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUnP8EACgkQAVBC80lX 0GzuVgf/XJeoQF5D8JpWF3YB37FVbdZm3PvJJr0N5LKTsYcwwOhaBIms38+UcD5S TntSRx3UiVlPC4walmHH74a+d5is2W46BMSWSgkne58MLJ2Js/qEs1k6EnTzSwN/ XW/bjrpjD0cTivwGTLssG/Zz+QmAkplL0xpgnkrQ4y1+JCoEAOXqejpJpENXloPP ZI9qOqb6hB6FEoyq5BS1PmvKqzBGCl9DB/WtYOFjP7iAIYTpHMlM8iUo7kUq2DxX WUI16HxCIa/d1Xbz+UWD0/VcIPAp/mRTU0oMjzyhx+ascJPtqdd9v0KR5mydh64I +FLQ2eGwYxXjr191YzYb2VFij29aJg== =bNpy -----END PGP SIGNATURE----- --Sig_/wof5tWYoXT/+z+takc=pVNJ--