From patchwork Thu Feb 17 00:09:03 2022
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: 12749174
X-Patchwork-Delegate: johannes@sipsolutions.net
Return-Path: <linux-wireless-owner@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 BB2F8C433FE
	for <linux-wireless@archiver.kernel.org>;
 Thu, 17 Feb 2022 00:09:17 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S238655AbiBQAJ2 (ORCPT
        <rfc822;linux-wireless@archiver.kernel.org>);
        Wed, 16 Feb 2022 19:09:28 -0500
Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:57396 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229820AbiBQAJ0 (ORCPT
        <rfc822;linux-wireless@vger.kernel.org>);
        Wed, 16 Feb 2022 19:09:26 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org
 [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20CD12A0D5F;
        Wed, 16 Feb 2022 16:09:13 -0800 (PST)
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 4JzZtm4lBLz4xv2;
        Thu, 17 Feb 2022 11:09:04 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1645056548;
        bh=aFgbb19PdfuiQgsKTnloIe4Cdxn6pysbLZDibuzMHSQ=;
        h=Date:From:To:Cc:Subject:From;
        b=pp6xMnlyDZY36465Orog80PIf7TuqocrVFR14PteUke4iMgbzX7ySdUUhPNz5yt0/
         VauOI8zSocCm6lAPQrMoJTBW7hAIMDfS4OeduJvP78q08gGNTP5MgTl5xjmqSKhTt+
         QASYCA8dVOGuvtIJ/lcyDgyMO9iEP8B551/RVrANoYsB1WN6WU+OSBH4vrYpcmha4o
         nfEFQQa211Fu/5tBzo2UAkWzu6fmihFr3oNjYX/AD22OrrGhVku9HP6Epj10QbErVN
         KI+mI32awzoX1TO3+Zg0V8Gs2MEqqCzOq2Sdzr9zmrj239Y9cNbFIcHNrndrr9OWiC
         xrUhLEm8vh3Tw==
Date: Thu, 17 Feb 2022 11:09:03 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kalle Valo <kvalo@kernel.org>,
        Johannes Berg <johannes@sipsolutions.net>,
        Wireless <linux-wireless@vger.kernel.org>,
        David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc: Ilan Peer <ilan.peer@intel.com>,
        Jiasheng Jiang <jiasheng@iscas.ac.cn>,
        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 wireless-next tree with the net
 tree
Message-ID: <20220217110903.7f58acae@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 wireless-next tree got a conflict in:

  net/mac80211/mlme.c

between commit:

  a72c01a94f1d ("mac80211: mlme: check for null after calling kmemdup")

from the net tree and commit:

  820acc810fb6 ("mac80211: Add EHT capabilities to association/probe request")

from the wireless-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/mlme.c
index 20b57ddf149c,197cad4a2768..000000000000
--- a/net/mac80211/mlme.c