From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1758318AbdJQNB5 (ORCPT <rfc822;w@1wt.eu>);
        Tue, 17 Oct 2017 09:01:57 -0400
Received: from heliosphere.sirena.org.uk ([172.104.155.198]:42502 "EHLO
        heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1754203AbdJQNBz (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 17 Oct 2017 09:01:55 -0400
Date: Tue, 17 Oct 2017 14:01:41 +0100
From: Mark Brown <broonie@kernel.org>
To: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Cc: David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>,
        Vivien Didelot <vivien.didelot@savoirfairelinux.com>,
        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 net-next tree with the net tree
Message-ID: <20171017130141.k2yme2uezaeb3hdp@sirena.co.uk>
References: <20171016093635.zxyyq2px4hdewse3@sirena.co.uk>
 <dbf0a501-7dcf-82ff-6fbf-000d66a68e18@cogentembedded.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="ibt3iqzhvhr7lkd7"
Content-Disposition: inline
In-Reply-To: <dbf0a501-7dcf-82ff-6fbf-000d66a68e18@cogentembedded.com>
X-Cookie: Whatever became of eternal truth?
User-Agent: NeoMutt/20170609 (1.8.3)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


--ibt3iqzhvhr7lkd7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Tue, Oct 17, 2017 at 02:30:29PM +0300, Sergei Shtylyov wrote:

> > diff --cc drivers/net/dsa/mv88e6060.c
> > index f123ed57630d,6173be889d95..000000000000
> > --- a/drivers/net/dsa/mv88e6060.c
> > +++ b/drivers/net/dsa/mv88e6060.c

>    Your mail ends here.

Yes, that's the resulting diff.

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

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

iQEzBAABCAAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAlnl/zQACgkQJNaLcl1U
h9CcjAf9FHnikaJEiLAQxgajXbdgaEW3ZnVe0Uqk4mYD5SG01iRRSq3UZV/kaBLL
gQc6FaX8VVpcIse/4JmphQnhR1qt08lphJGLI5nxxDiJPw3EhX/DVFRG2nuyqBYO
FJ7rvx6ZCZp9YWSv/SNjcpyEyScMC9fX+AMlIRmXb2jlGB0oGKo9TEhWISpfDW4u
KDLmoxm5XaqBhARUloMbLZgkUQSdVJcmGM7KC8h4rQfyck6xAY7ySntiwz0oUTzs
eXRfak7ELPHroqULTU8bv01XykgFw6ESbk4IvdXm+sTStC5FBwvacUYfchqvULyy
VBRGKyrTN4EcsvvtpDLw1h0cJKLf2w==
=idvD
-----END PGP SIGNATURE-----

--ibt3iqzhvhr7lkd7--