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 <sfr@canb.auug.org.au>
X-Patchwork-Id: 737775
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 86EBEC25B67
 for <linux-wireless@archiver.kernel.org>;
 Tue, 24 Oct 2023 00:24:33 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
 id S230421AbjJXAYc (ORCPT
 <rfc822;linux-wireless@archiver.kernel.org>);
 Mon, 23 Oct 2023 20:24:32 -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
 <rfc822;linux-wireless@vger.kernel.org>);
 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 <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>,
 Paolo Abeni <pabeni@redhat.com>, Kalle Valo <kvalo@kernel.org>,
 Johannes Berg <johannes@sipsolutions.net>
Cc: Wireless <linux-wireless@vger.kernel.org>,
 Networking <netdev@vger.kernel.org>,
 Avraham Stern <avraham.stern@intel.com>,
 Gregory Greenman <gregory.greenman@intel.com>,
 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 net-next tree with the wireless tree
Message-ID: <20231024112424.7de86457@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 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