From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: manual merge of the mac80211-next tree with the
 mac80211 tree
Date: Tue, 9 Apr 2019 18:11:14 +1000
Message-ID: <20190409181114.0513c896@canb.auug.org.au>
References: <20190409110607.29df3cf3@canb.auug.org.au>
        <7deebb8e8c82e4455af8fc4963ffc7acca3aab36.camel@sipsolutions.net>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/nBkp4e3rMK.6Roc4=v3h8wr"; protocol="application/pgp-signature"
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <7deebb8e8c82e4455af8fc4963ffc7acca3aab36.camel@sipsolutions.net>
Sender: linux-kernel-owner@vger.kernel.org
To: Johannes Berg <johannes@sipsolutions.net>
Cc: Wireless <linux-wireless@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Felix Fietkau <nbd@nbd.name>, David Miller <davem@davemloft.net>
List-Id: linux-next.vger.kernel.org

--Sig_/nBkp4e3rMK.6Roc4=v3h8wr
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Johannes,

On Tue, 09 Apr 2019 09:27:35 +0200 Johannes Berg <johannes@sipsolutions.net=
> wrote:
>
> But yes, I'm aware. It seemed simple enough though that I decided to
> keep it like that, I didn't really find a better solution.

Yeah, pretty trivial.  I assume both trees will meet in Dave's tree at some=
 point.

--=20
Cheers,
Stephen Rothwell

--Sig_/nBkp4e3rMK.6Roc4=v3h8wr
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlysU6IACgkQAVBC80lX
0GwovAf9EXARDSIHDX0A95Nbv7THG0BTJ6tgMCTuINOXIwYPWzdpAFDUVVrAJM/h
pio4swOqexjh7EpvzqyOukkGopXpeVLrg/ucgqjYEpxMIWzCvE22+6qOHUYfmpMD
ljjUF5di7sJ577DcOkq82ouxBGzxmZheIdgpxDcLPR5DCsl4+oqJvI/Ck3zVOo2U
nvbMzgQsuSZlkSupc9RNZPCw9TgVEfEAFx7R4b/5JUHsNDOdCNQhsjFziib9HnXO
TjxtrFQxzvIvqgcSGZuJVRAxrhJaTRiHat0+G1hR8EJ1H0MWgR28OsSLCdLQyrzu
l3JEH5ML/+oWkEI8ZsgMF7/9o1Vbdw==
=qsV8
-----END PGP SIGNATURE-----

--Sig_/nBkp4e3rMK.6Roc4=v3h8wr--