From patchwork Mon Mar 13 23:54:21 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: 662981
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 93E89C6FD1D
 for <linux-wireless@archiver.kernel.org>;
 Mon, 13 Mar 2023 23:54:36 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
 id S230180AbjCMXye (ORCPT
 <rfc822;linux-wireless@archiver.kernel.org>);
 Mon, 13 Mar 2023 19:54:34 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45928 "EHLO
 lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
 with ESMTP id S230061AbjCMXy3 (ORCPT
 <rfc822;linux-wireless@vger.kernel.org>);
 Mon, 13 Mar 2023 19:54:29 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
 by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 183D619F1E;
 Mon, 13 Mar 2023 16:54:26 -0700 (PDT)
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 (P-256) server-signature RSA-PSS (4096 bits)
 server-digest SHA256) (No client certificate requested)
 by mail.ozlabs.org (Postfix) with ESMTPSA id 4PbD5q6gSmz4whr;
 Tue, 14 Mar 2023 10:54:22 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
 s=201702; t=1678751665;
 bh=T0N+rXIbClzSIFFsBqWugRWo9U1U5OtD1gue76ktyYo=;
 h=Date:From:To:Cc:Subject:From;
 b=IodiPqO7SvTvCuvWRiCg3vHnSD9pqmlmnKqxXYjtntkJmSuX9gf5XRDMJafIYV1M8
 G5EOBBisIhXhTt/6S+vqgy9UkawFueBq1Jb7ouj9HjRrS7qM66sR2sowJlQIYVTYt6
 WzzO4VsBNgoIdQZ9xxLKip1UUFZZOekNf11jANuUqxelBUQc+N7jZ1/WXcnC88BZa7
 FYbIso6E5pIuwwJ1vVKj951EeaSPQEuG4MpDIWLgkKtryuYuQJ+CXScP4MW+iwgmGz
 ZOKF9cG7rQMytn3pxWG5TzcqUO7faqN9jqphb3fHhHeJH1rzNCl/TfebqrFsYpdnyM
 L6Z5cQeSnPLbg==
Date: Tue, 14 Mar 2023 10:54:21 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>, Networking <netdev@vger.kernel.org>,
 <linux-wireless@vger.kernel.org>, Avraham Stern <avraham.stern@intel.com>,
 Gregory Greenman <gregory.greenman@intel.com>,
 Johannes Berg <johannes.berg@intel.com>,
 Matthieu Baerts <matthieu.baerts@tessares.net>,
 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 net tree
Message-ID: <20230314105421.3608efae@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/wireless/nl80211.c

between commit:

  b27f07c50a73 ("wifi: nl80211: fix puncturing bitmap policy")

from the net tree and commit:

  cbbaf2bb829b ("wifi: nl80211: add a command to enable/disable HW timestamping")

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.

Thanks for the heads up.

diff --cc net/wireless/nl80211.c
index 4f63059efd81,0a31b1d2845d..000000000000
--- a/net/wireless/nl80211.c