Messages in this thread | | | From | Arnd Bergmann <> | Subject | Re: linux-next: manual merge of the net-next tree with the arm-soc tree | Date | Wed, 10 Sep 2014 10:06:19 +0200 |
| |
On Wednesday 10 September 2014 14:48:37 Stephen Rothwell wrote: > Today's linux-next merge of the net-next tree got a conflict in > arch/arm/boot/dts/rk3188-radxarock.dts between commit 4721ab855d1a > ("ARM: dts: rockchip: add hym8563 rtc to Radxa Rock board") from the > arm-soc tree and commit c6ec956b73db ("ARM: dts: Enable emac node on > the rk3188-radxarock boards") from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). >
Thanks, looks good.
Arnd
| |