Re: linux-next: manual merge of the arm-soc tree with the net-next tree
From: Mugunthan V N <hidden>
Date: 2012-11-27 11:23:17
Also in:
linux-arm-kernel, linux-next, lkml
On 11/26/2012 3:15 PM, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/am33xx.dtsi between commit 1a39a65cba08 ("arm/dts:
am33xx: Add CPSW and MDIO module nodes for AM33XX") from the net-next
tree and commits 059b185d5345 ("ARM: dts: AM33XX: Add D_CAN device tree
data") and 4c94ac29b5c1 ("ARM: dts: OMAP: Move interrupt-parent to the
root node to avoid duplication") (and a few others that added more later
nodes) from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).Stephen Rothwell The fix is correct and I have tested CPSW from linux-next. Regards Mugunthan V N