linux-next: manual merge of the net-next tree with the berlin tree
From: Stephen Rothwell
Date: Tue Sep 30 2014 - 21:22:28 EST
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@xxxxxxxxxxxxxxxx
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";
+ };
Attachment:
signature.asc
Description: PGP signature