linux-next: manual merge of the net-next tree with the arm-soc tree
arnd at arndb.de
Wed Sep 10 01:06:19 PDT 2014
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.
More information about the linux-arm-kernel