Date: Fri, 9 Jun 2017 15:58:17 +0200
From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Andre Przywara <andre.przywara@arm.com>
Cc: jagannadh.teki@gmail.com, Chen-Yu Tsai <wens@csie.org>,
        Sean Wang <sean.wang@mediatek.com>, Icenowy Zheng <icenowy@aosc.io>,
        Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will.deacon@arm.com>,
        Michael Trimarchi <michael@amarulasolutions.com>,
        linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com,
        Jagan Teki <jagan@amarulasolutions.com>,
        David Miller <davem@davemloft.net>
Subject: Re: [linux-sunxi] [PATCH] arm64: allwinner: sun50i-a64: Remove
 duplicate ethernet@1c30000
Message-ID: <20170609135817.wntaqkbekiagq45e@flea.home>
References: <1497012052-14027-1-git-send-email-jteki@openedev.com>
 <6d21516d-7412-5f16-f6f8-b7d46106b4f5@arm.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
        protocol="application/pgp-signature"; boundary="zq7ifyqrachzhhgv"
Content-Disposition: inline
In-Reply-To: <6d21516d-7412-5f16-f6f8-b7d46106b4f5@arm.com>
User-Agent: NeoMutt/20170602 (1.8.3)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1719
Lines: 50


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

On Fri, Jun 09, 2017 at 02:38:39PM +0100, Andre Przywara wrote:
> Hi,
>=20
> On 09/06/17 13:40, Jagan Teki wrote:
> > From: Jagan Teki <jagan@amarulasolutions.com>
> >=20
> > Remove duplicate ethernet@1c30000 from allwinner/sun50i-a64.dtsi
>=20
> I think this is an artefact of the sun8i-dwmac merging, where both David
> and Maxime merged the DT patches in their trees (compare e53f67e9 and
> 103aefa0). I think both of them are in the process of sorting this out
> (as this effects more than this hunk, I believe).

Yeah, hopefully we'll manage to fix this.

Thanks!
Maxime

--=20
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

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

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

iQIcBAEBAgAGBQJZOql5AAoJEBx+YmzsjxAgNt0P/2sjmUVjpPU32oHOjHPBXn48
TbOHhajCg82Crt0X5SKhJ/ULsBq9LQ54pwfE4gJP4RGWRcQLAx1Ag3ufYuTzMEsa
UwLbBmS8by3qzvAYNu9EQkTr+81nN6L6SfHtCQS6e1KeTmbwPf9PdCPVX8rLGhG3
YH8gC36p61QcDP4yXWPpB8AR1qVvLCETlTeVLJyTZwlkdtr12E0xxY2Utc/Y7J9x
s+d27b3JXM/GHYNEvdlDAxjM+GYpIhhqg+VlSuptcsAH1YTK7Wsf9vBD5yLdiIxX
zX82UuxrqTtxEKTSgGEoGBzOTa97jVoh9iMkImDKGfE/2RLEP4qGdODKO7WPyaSH
2HQJQ+oEHlJxifRmj/VYYbCAPHvT3TIhPEKQ4GVN46A4ai2532rSBVhTny7bad5X
EZal2Rwuf3I9LRAQ0OwNFNWC4C1tN27+qOplWYcLE0ED6rOjk7+ZpmviNsxorOQx
RRmuUtHeFLDvV0Xnu7xzuvUWcYoPe4Cy91snOgjHaQzVgNtipT7w6MVNHv0yd7yn
qn9eiaOxjYTN3gx54wkS/Wrn3kSB9kpu1JQnl/Fwjy0SstX7pcoyNyxgEm0yKdRi
byW2TDCpYNtla+fGaxFwg2kh3HYo26duVuUE+5vqRNenVXj+X5f2WCuTT6S0zKVj
Zw3hxj8M9aOxZhI3Ijjh
=eVt6
-----END PGP SIGNATURE-----

--zq7ifyqrachzhhgv--