Re: linux-next: manual merge of the net-next tree with the rockchip tree

Hi all, On Tue, 22 Aug 2017 11:24:14 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the net-next tree got a conflict in: > > arch/arm64/boot/dts/rockchip/rk3328-evb.dts > > between commits: > > ab78718bda79 ("arm64: dts: rockchip: Enable tsadc module on RK3328 > eavluation

linux-next: manual merge of the net-next tree with the rockchip tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: arch/arm64/boot/dts/rockchip/rk3328-evb.dts between commit: 0e54e062692a ("arm64: dts: rockchip: add mmc nodes for rk3328 evaluation board") 57fca160b2be ("arm64: dts: rockchip: add cpu regulator for rk3328 evaluati

linux-next: manual merge of the net-next tree with the rockchip tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: arch/arm64/boot/dts/rockchip/rk3328-evb.dts between commits: ab78718bda79 ("arm64: dts: rockchip: Enable tsadc module on RK3328 eavluation board") 1e28037ec88e ("arm64: dts: rockchip: add rk805 node for rk3328-evb")

linux-next: manual merge of the net-next tree with the rockchip tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in: arch/arm64/boot/dts/rockchip/rk3328.dtsi between commit: c60c0373a5e8 ("arm64: dts: rockchip: add usb2 nodes for RK3328 SoCs") from the rockchip tree and commit: 9c4cc910fe28 ("ARM64: dts: rockchip: Add gmac2phy no