Messages in this thread | | | Date | Wed, 1 Oct 2014 11:22:12 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net-next tree with the berlin tree |
| |
Hi all,
Today's linux-next merge of the net-next tree got a conflict in arch/arm/boot/dts/berlin2q-marvell-dmp.dts between commit 461316fca705 ("ARM: berlin: enable the eSATA interface on the BG2Q DMP") from the berlin tree and commit 75215193b975 ("ARM: dts: berlin: enable the Ethernet port on the BG2Q DMP") from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/boot/dts/berlin2q-marvell-dmp.dts index 1958cbfe61fa,ea1f99b8eed6..000000000000 --- a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts +++ b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts @@@ -46,10 -46,6 +46,14 @@@ status = "okay"; }; +&sata0 { + status = "okay"; +}; + +&sata_phy { + status = "okay"; +}; ++ + ð0 { + status = "okay"; + }; [unhandled content-type:application/pgp-signature] | |