Hi, On Fri, Jun 02, 2017 at 10:22:05AM -0400, David Miller wrote: > From: Maxime Ripard > Date: Fri, 2 Jun 2017 11:13:20 +0200 > > > On Fri, Jun 02, 2017 at 08:37:52AM +0200, Maxime Ripard wrote: > >> On Thu, Jun 01, 2017 at 02:58:19PM -0400, David Miller wrote: > >> > From: Corentin Labbe > >> > Date: Wed, 31 May 2017 09:18:31 +0200 > >> > > >> > > This patch series add the driver for dwmac-sun8i which handle the Ethernet MAC > >> > > present on Allwinner H3/H5/A83T/A64 SoCs. > >> > > >> > Series applied, but wow that's a lot of DT file changes :-( > >> > >> The DT patches should not go through your tree, but arm-soc, so I > >> guess this is not an issue for you? > > > > Ok, so I saw that you actually merged them. Can you revert or drop > > that merge for the DT part? > > > > This will generate a lot of conflicts with our tree, and I'm not sure > > this would be efficient to make you take all the entirely unrelated to > > next patches. > > Please tell me which specific changes to revert. > > Thank you. Ideally everything from 2c0cba482e79 ("arm: sun8i: sunxi-h3-h5: Add dt node for the syscon control module") to 2428fd0fe550 ("arm64: defconfig: Enable dwmac-sun8i driver on defconfig") Thanks! Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com