From patchwork Tue Oct 24 00:24:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 157154 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1632516vqx; Mon, 23 Oct 2023 17:24:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH7CRAH0vHIEtaPY5WvjElCryEw9tamNnEo+TpIcLolT1pupimZ1CCn8cTP5ngGcWNL2LGc X-Received: by 2002:a17:903:2348:b0:1c9:bfd3:1f4a with SMTP id c8-20020a170903234800b001c9bfd31f4amr8408707plh.66.1698107079618; Mon, 23 Oct 2023 17:24:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698107079; cv=none; d=google.com; s=arc-20160816; b=HFGxXPUzB8DxI3yK5gkA4r34LZc3dmlDb+iV4sjh6ExNL48zg6/o/cdd1LuOwu92G0 9FA0Hy6UsHczRPeThyn5aAB0YYLZVnzQVLG8v8pxE0dr/ynzKZ3Qj1u/MPTLA+WtMqWP omEkMejTOiCwKNRlHQCTvK9Ia/iw35iVkqpwXZl3e64DppPn92V33UJbt0gP5vH3VZjX nxU0KOZmpC5ISB4l7f8szEMMil4sjIs/qSsMst3HeXEJ9Tojrh4nEJqsUVcB2yyd7RoE eQuwyNjntTCZ3HoYk1kb2lTU4Ae1eAd6usC1UB21gvKlEtM2CVmoQ9et3v5leV7HOU3B i1/A== 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=VHG3qd0ihqSbQoervLNrF0qsR2BSCx5XwGkeZm5mMJw=; fh=/aVzvmyOgmNi9+9btbpMJMw8+rlEoFQ6neC85sKUv4o=; b=qSaFCBJ9i80VKPFxwRC60RlwTIonw7SgAyPWge9MJccow4nT2IU9xe8XrKi7iPuJBo 68/cBH6OHrz0kqf4u9W0qd6TB4VP7d9c2NFNKMsm6htYxE7MJYKlNrz5b6rYWru8ZIAz JWkRfkzmCA+nfPJ+P6FmNfwW+CTXgZxPV2ufygqWnLZWgkmPgBdk+4FQC/P/wTjtIX2Q /79DfqejLdjGqfQYPZ5U/lMWwl+YaOxMz+6rQ9BPVV98xEeVPuqNdVuqql6qLr57eIdj 9WEKmsd9mr+yIuy9gdbE3ediVUgELvmVFEIRNGiRiBzDWS+ah3PMXnNcvsfI7a/0Z9N4 xMWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=B8VfHiqk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id ay8-20020a1709028b8800b001c9d7d70d7bsi7041432plb.4.2023.10.23.17.24.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 17:24:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=B8VfHiqk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 9F30D80C113A; Mon, 23 Oct 2023 17:24:38 -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 S231172AbjJXAYd (ORCPT + 27 others); Mon, 23 Oct 2023 20:24:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229552AbjJXAYc (ORCPT ); Mon, 23 Oct 2023 20:24:32 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF8AA10C; Mon, 23 Oct 2023 17:24:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1698107068; bh=VHG3qd0ihqSbQoervLNrF0qsR2BSCx5XwGkeZm5mMJw=; h=Date:From:To:Cc:Subject:From; b=B8VfHiqkm/9nfuJmVNKEvFAeiPqH1H0ap5GAPk+cBi5qGgddSX30Zy7qdV2kEDa7S e89qqkyBRrHXoOGMrP25V/aHizh+IzgOKBWBX1xd0YQxaRWVEw6yfNw2DoOdP9LA/j S0ig817d0NhJjZmma2iQr6mvsAVviY8RxE++ZaPZaD4yBmy6vKbga17IlAQaS6WA8k mrOvPY4z7qU4xwrcPNPRZkdzdgv1Ly7kMVtahTWePkuz0o6+QTF0wyFdqQA1HnuJlh dnWEBTLAxzwD1BMrEPC0Le3eOsfa+RXA0wGtco1oo1a7BaXZsf50uaHNTt+ZCsZyac hpBg3E4Y0DaPg== 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 4SDt964JWwz4wdB; Tue, 24 Oct 2023 11:24:26 +1100 (AEDT) Date: Tue, 24 Oct 2023 11:24:24 +1100 From: Stephen Rothwell To: David Miller , Jakub Kicinski , Paolo Abeni , Kalle Valo , Johannes Berg Cc: Wireless , Networking , Avraham Stern , Gregory Greenman , 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: <20231024112424.7de86457@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, 23 Oct 2023 17:24:38 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780594328828264865 X-GMAIL-MSGID: 1780594328828264865 Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/mac80211/rx.c between commit: 91535613b609 ("wifi: mac80211: don't drop all unprotected public action frames") from the wireless tree and commit: 6c02fab72429 ("wifi: mac80211: split ieee80211_drop_unencrypted_mgmt() return value") from the net-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/rx.c index 8f6b6f56b65b,051db97a92b4..000000000000 --- a/net/mac80211/rx.c