From patchwork Tue Sep 12 02:46:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 138238 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp471399vqx; Tue, 12 Sep 2023 08:06:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGaggw/h14G0KFf74GN6ZUZuQyMoB19PBbUlEgXnqfrnc+S/VjGJ4FJERm1xjJbhfY8+rh5 X-Received: by 2002:a05:6a20:7d8b:b0:13d:17cc:5bca with SMTP id v11-20020a056a207d8b00b0013d17cc5bcamr13002365pzj.18.1694531185366; Tue, 12 Sep 2023 08:06:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694531185; cv=none; d=google.com; s=arc-20160816; b=NOvd06FUhVJHf5FIayjttBXqC1J2iKFPICj3u21hQ6am8K2iF+WWTj9Np/DQrOofny drG+/UM4xib/McfvJSgWGQerXRXjXzQI1EMVk1rf8IClbmBR6z8odZMJYDemSlGXQhw1 C6iWdfQwrt++EdCRsF/DJPEANI9sWkdd0N2vbR31GVgd1XaBy8DfbRxUNhyHxZgdZMB6 39ErwzZjLFTdvFE3Ac40Toi17qGj9faFnn4L8YX1vl0fb29vZ/BrKMyf76GXqSLUe3Xl 2OgLhaOgfEw9TVIMjt8RbSEuzdWdWV6e6Y1uzhA+a4SbLBo4wtxRei6q601+bjiHC8Pd BmCA== 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=9w8N1w65eM3j1HplfovIWdoaEqkHF1YpWPFz5tjpCFo=; fh=YSlvpPL42+OV5bLFCL+NbyjIvOHCcshrxbzBHge5Zrw=; b=OWasBa1N3zNJ30pfS4po6j3zoNswXUKFA7HSBluyQ0mr7OLCKKXQ0ay0dTNfOsg4ai FxTHCBHRGh2FLQCuhsLA5KFQaqYCBcvRmFTsBevypBmvNudCQhHlnpUUtIpeWUkZo4Ys m1M9jkhudorHxRqGqFMHLnjlRzAYZ+XMJ5vmlQlIuG4ZKLu6J5Syx61L/5SdnqMu0GTE FhBW2NYZqROEf2BO6QBFJEuQZrywyDEFfbg34dFhvdU3wHzy2lUf23bnypa+IV4HJO7K IHEqIcbIrDTmvh/uqTzA5KxmASSmfUjc0WBDUCYKcWpSOCSHEB7t2GYT5sR/zYTfxatE o+Bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=naIlmKO7; 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 f6-20020a056a00238600b0068a5daac5a5si8400877pfc.148.2023.09.12.08.06.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 08:06:25 -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=naIlmKO7; 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 6A3458258C95; Mon, 11 Sep 2023 21:36:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.8 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242471AbjILDPl (ORCPT + 40 others); Mon, 11 Sep 2023 23:15:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242025AbjILDP0 (ORCPT ); Mon, 11 Sep 2023 23:15:26 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 250926CD7; Mon, 11 Sep 2023 19:46:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1694486786; bh=9w8N1w65eM3j1HplfovIWdoaEqkHF1YpWPFz5tjpCFo=; h=Date:From:To:Cc:Subject:From; b=naIlmKO7lUSHzKh3udlfvGQAyEBpEO6uHF4815s40RKckMzEJAizrivmQ/FhSlhOb G8M6UGG9lYS9LFgrsuwa+zgk2k3X2OjKSWczolx31ctq1GKJebXMx2I2BTTzz/CCwW ikOShORCXJgH5ZRZLx9cUL/NfgOvsf12vuw7q5ZN9kIO8FTptXQ359QQI0NCu6gkLF dn3MzwOGVskGP5zFN6Jli0nqWgrT6EiKs8QOa5dc2GlCxTtd+LhZldZ152pXGSn7Cl +/yy0eYtelhaE2jCRG1Lk0J0AIGIYsVdUz2XrhWe5Nj9pindOZ6Y5LIbq3kh+0BaHK 24pVpuzDswEPg== 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 4Rl7JJ4Pfgz4x3C; Tue, 12 Sep 2023 12:46:24 +1000 (AEST) Date: Tue, 12 Sep 2023 12:46:23 +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: <20230912124623.6591edd4@canb.auug.org.au> MIME-Version: 1.0 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, 11 Sep 2023 21:36:48 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776844732330900383 X-GMAIL-MSGID: 1776844732330900383 Hi all, Today's linux-next merge of the wireless-next tree got a conflict in: net/wireless/nl80211.c between commit: 37c20b2effe9 ("wifi: cfg80211: fix cqm_config access race") from the wireless tree and commit: 076fc8775daf ("wifi: cfg80211: remove wdev mutex") from the wireless-next tree. I fixed it up (I used a supplied resolution from Johannes - 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/wireless/nl80211.c index 7a88361b3414,ab0aea7dca7d..fe06c238d4ef --- a/net/wireless/nl80211.c