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 phy-next tree with Linus' tree
Date: Wed, 12 Dec 2018 16:12:17 +1100
Message-ID: <20181212161217.6858c3d9@canb.auug.org.au>
References: <20181212151647.71a5befe@canb.auug.org.au>
        <c868398c-9410-fa2d-26f4-dd86102a3584@ti.com>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/NYZ_D_aq.qzWg_=V6_JZRd_"; protocol="application/pgp-signature"
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <c868398c-9410-fa2d-26f4-dd86102a3584@ti.com>
Sender: linux-kernel-owner@vger.kernel.org
To: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Douglas Anderson <dianders@chromium.org>, Evan Green <evgreen@chromium.org>
List-Id: linux-next.vger.kernel.org

--Sig_/NYZ_D_aq.qzWg_=V6_JZRd_
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Kishon,

On Wed, 12 Dec 2018 10:37:37 +0530 Kishon Vijay Abraham I <kishon@ti.com> w=
rote:
>
> I've rebased by 'next' branch on top of my 'fixes' branch to avoid this c=
onflict.

Why didn't you just merge them?

--=20
Cheers,
Stephen Rothwell

--Sig_/NYZ_D_aq.qzWg_=V6_JZRd_
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlwQmLEACgkQAVBC80lX
0GwJQgf/Q8rj7NKsR1MVSfp2w8naAwbijTE3Ot70ad66DiAAtM7uZl9nZsVQvypG
37zF+QhG5VuARnBX0nEpU+ugVZhyNDVJ0fah25kHib28Ey8+cDwT3L+UUOg0eyvA
J6vMKfXG5nYqZjlLDZR+9UsuXyEsn0k/OqMUQWAgMNHbVw0AiXOQCJTWSLZFrxul
61/uqiJVRm22FuzuPIP3Zisy/l2L6o2q8P8oHsTshwcDmlk51eLUH684qusJITIJ
zD2H4NUXPxkcAkDhEX6e2Jp1QeDYGMLaBE8/4IoU5svA23NgS85UZ0oqtdwXMkEF
t7uU9G1jnGLt6FyT1Lqgc/Y9dzZhzA==
=gGpO
-----END PGP SIGNATURE-----

--Sig_/NYZ_D_aq.qzWg_=V6_JZRd_--