Return-path: <linux-wireless-owner@vger.kernel.org>
Received: from heliosphere.sirena.org.uk ([172.104.155.198]:45418 "EHLO
        heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751618AbdJLSVT (ORCPT
        <rfc822;linux-wireless@vger.kernel.org>);
        Thu, 12 Oct 2017 14:21:19 -0400
Date: Thu, 12 Oct 2017 19:21:14 +0100
From: Mark Brown <broonie@kernel.org>
To: Luciano Coelho <luciano.coelho@intel.com>
Cc: Kalle Valo <kvalo@codeaurora.org>,
        Chaya Rachel Ivgi <chaya.rachel.ivgi@intel.com>,
        Shahar S Matityahu <shahar.s.matityahu@intel.com>,
        Wireless <linux-wireless@vger.kernel.org>,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with
 the wireless-drivers tree
Message-ID: <20171012182114.fdeiv67ebx7c63te@sirena.co.uk> (sfid-20171012_202247_223605_2286DCB8)
References: <20171012172512.tlsdjhppfz2hu4vr@sirena.co.uk>
 <1507832196.5497.1.camel@intel.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="oi3qykxsazyvkqrj"
In-Reply-To: <1507832196.5497.1.camel@intel.com>
Sender: linux-wireless-owner@vger.kernel.org
List-ID: <linux-wireless.vger.kernel.org>


--oi3qykxsazyvkqrj
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Oct 12, 2017 at 09:16:36PM +0300, Luciano Coelho wrote:

> This is weird... The previous conflict was the exact opposite of this.=20
> 44fd09 came in from wireless-drivers and dd05f9 came from wireless-
> drivers-next.  I don't understand why it is saying the opposite here...

I may have confused the trees when I was pasting things in, the commits
are filled in by hand.

--oi3qykxsazyvkqrj
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCAAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAlnfspkACgkQJNaLcl1U
h9CFAQf/XM40iBAJ+DOFBaLzDyPuZ6pbmO0kfSeFaqstXTAbi3N0MDAaxn5vQLhw
p1xhuha3X67W9UtFx0FRIfOL+JJAHz5tqi+4ocK97Ehn7k0D3zHGjTfmw9RVgKm9
RgC+rM/vrqfy1ElQYyuacNZzYhQi/FFcsaGc7ZTjbGfssxBbVsp0DhJit5GaZnhA
WxFblDVUwSjYFxnfus22J+UZd4NiPoF49d2WfIjC22z+O6qh3M8mfPXB1SVz3imq
OL34skuO0BZfZk03q7nR7tuI1kxlKo/K2GpBxFMT+jM+tbPg4p2b0EJDwEIaLN5X
gtnlVJPlA0eSB2QFslvuT5FbWLwq4w==
=gRuf
-----END PGP SIGNATURE-----

--oi3qykxsazyvkqrj--