Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 20 Oct 2022 03:23:40 +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>
Cc:     David Miller <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Ilan Peer <ilan.peer@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 wireless-next tree with Linus' tree
Message-ID: <20221020032340.5cf101c0@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/QPch7.CbFCOkhnPOVW._2io";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/QPch7.CbFCOkhnPOVW._2io
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

Today's linux-next merge of the wireless-next tree got a conflict in:

  net/mac80211/util.c

between commit:

  ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")

from the origin tree and commit:

  ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")

from the wireless-next tree.

I fixed it up (I just used the latter version) 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.

--=20
Cheers,
Stephen Rothwell

--Sig_/QPch7.CbFCOkhnPOVW._2io
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmNQJIwACgkQAVBC80lX
0GxAlAf/aHM3on2G4e5RKXL4lH05joPGVAbUVxATSIVImtY4deYQEQng/x32Z/bC
avmlu2lCwUTtLaCp94cPwmHu6cjmCCFythOz3w053z16/CO7Uy/Kdjpwdug+J1z5
V9MLMXlFFisDx4aYaJiq0daYJW1yggdqkZpdn34N1c7cw8kvLTeMDmOGEjlERe4Z
Uu5M0EskEgncOljFcwjBmoTe6dNfF3wyXUuj9urIV64MHF68gCsjE6r946trlynH
FkFDqFBgO8B1YsXLWam5snGldbrjGfApd9ky5fhpoi+PejQ+F3+4hz2+XuqZ616Z
6FztdQoZDMH10HHJphQFh9L+s6mtGA==
=fsIU
-----END PGP SIGNATURE-----

--Sig_/QPch7.CbFCOkhnPOVW._2io--