diff for duplicates of <20141116021521.GD15870@lunn.ch>

diff --git a/a/1.txt b/N1/1.txt
index 2b47524..a478395 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -22,7 +22,7 @@ On Sun, Nov 16, 2014 at 01:04:34AM +0100, Arnaud Ebalard wrote:
 > directly connected to the SoC and under its control. The former are
 > presumably driven by the SATA controller, the latter by the PIC. 
 > 
-> Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
+> Signed-off-by: Arnaud Ebalard <arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>
 > ---
 >  arch/arm/boot/dts/Makefile                     |   3 +-
 >  arch/arm/boot/dts/armada-xp-synology-ds414.dts | 343 +++++++++++++++++++++++++
@@ -52,7 +52,7 @@ On Sun, Nov 16, 2014 at 01:04:34AM +0100, Arnaud Ebalard wrote:
 > +/*
 > + * Device Tree file for Synology DS414
 > + *
-> + * Copyright (C) 2014, Arnaud EBALARD <arno@natisbad.org>
+> + * Copyright (C) 2014, Arnaud EBALARD <arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>
 > + *
 > + * This program is free software; you can redistribute it and/or
 > + * modify it under the terms of the GNU General Public License
@@ -105,7 +105,7 @@ On Sun, Nov 16, 2014 at 01:04:34AM +0100, Arnaud Ebalard wrote:
 > +			 * Connected to Marvell 88SX7042 SATA-II controller
 > +			 * handling the four disks.
 > +			 */
-> +			pcie at 1,0 {
+> +			pcie@1,0 {
 > +				/* Port 0, Lane 0 */
 > +				status = "okay";
 > +			};
@@ -114,7 +114,7 @@ On Sun, Nov 16, 2014 at 01:04:34AM +0100, Arnaud Ebalard wrote:
 > +			 * Connected to EtronTech EJ168A XHCI controller
 > +			 * providing the two rear USB 3.0 ports.
 > +			 */
-> +			pcie at 5,0 {
+> +			pcie@5,0 {
 > +				/* Port 1, Lane 0 */
 > +				status = "okay";
 > +			};
@@ -214,16 +214,16 @@ suggest following the naming convention used by the 370.
 > +			};
 > +
 > +			mdio {
-> +				phy0: ethernet-phy at 0 { /* Marvell 88E1512 */
+> +				phy0: ethernet-phy@0 { /* Marvell 88E1512 */
 > +					reg = <0>;
 > +				};
 > +
-> +				phy1: ethernet-phy at 1 { /* Marvell 88E1512 */
+> +				phy1: ethernet-phy@1 { /* Marvell 88E1512 */
 > +					reg = <1>;
 > +				};
 > +			};
 > +
-> +			ethernet at 70000 {
+> +			ethernet@70000 {
 > +				status = "okay";
 > +				pinctrl-0 = <&pmx_ge0>;
 > +				pinctrl-names = "default";
@@ -231,7 +231,7 @@ suggest following the naming convention used by the 370.
 > +				phy-mode = "rgmii-id";
 > +			};
 > +
-> +			ethernet at 74000 {
+> +			ethernet@74000 {
 > +				pinctrl-0 = <&pmx_ge1>;
 > +				pinctrl-names = "default";
 > +				status = "okay";
@@ -239,12 +239,12 @@ suggest following the naming convention used by the 370.
 > +				phy-mode = "rgmii-id";
 > +			};
 > +
-> +			spi0: spi at 10600 {
+> +			spi0: spi@10600 {
 > +				status = "okay";
 > +				pinctrl-0 = <&pmx_spi>;
 > +				pinctrl-names = "default";
 > +
-> +				spi-flash at 0 {
+> +				spi-flash@0 {
 > +					#address-cells = <1>;
 > +					#size-cells = <1>;
 > +					compatible = "micron,n25q064";
@@ -268,32 +268,32 @@ suggest following the naming convention used by the 370.
 
 Seems to be a cut/paste of the 370 text. So same comments.
 
-> +					partition at 00000000 { /* u-boot */
+> +					partition@00000000 { /* u-boot */
 > +						label = "RedBoot";
 > +						reg = <0x00000000 0x000d0000>; /* 832KB */
 > +					};
 > +
-> +					partition at 000c0000 { /* uImage */
+> +					partition@000c0000 { /* uImage */
 > +						label = "zImage";
 > +						reg = <0x000d0000 0x002d0000>; /* 2880KB */
 > +					};
 > +
-> +					partition at 003a0000 { /* uInitramfs */
+> +					partition@003a0000 { /* uInitramfs */
 > +						label = "rd.gz";
 > +						reg = <0x003a0000 0x00430000>; /* 4250KB */
 > +					};
 > +
-> +					partition at 007d0000 { /* MAC address and serial number */
+> +					partition@007d0000 { /* MAC address and serial number */
 > +						label = "vendor";
 > +						reg = <0x007d0000 0x00010000>; /* 64KB */
 > +					};
 > +
-> +					partition at 007e0000 {
+> +					partition@007e0000 {
 > +						label = "RedBoot config";
 > +						reg = <0x007e0000 0x00010000>; /* 64KB */
 > +					};
 > +
-> +					partition at 007f0000 {
+> +					partition@007f0000 {
 > +						label = "FIS directory";
 > +						reg = <0x007f0000 0x00010000>; /* 64KB */
 > +					};
@@ -301,15 +301,15 @@ Seems to be a cut/paste of the 370 text. So same comments.
 > +			};
 > +
 > +			/* Front USB 2.0 port */
-> +			usb at 50000 {
+> +			usb@50000 {
 > +				status = "okay";
 > +			};
 > +
-> +			i2c at 11000 {
+> +			i2c@11000 {
 > +				clock-frequency = <400000>;
 > +				status = "okay";
 > +
-> +				s35390a: s35390a at 30 {
+> +				s35390a: s35390a@30 {
 > +					 compatible = "ssi,s35390a";
 
 sii
@@ -321,21 +321,21 @@ Ah! It is also wrong in kirkwood-synology.dtsi
 > +			};
 > +
 > +			/* RTC is provided by Seiko S-35390A above */
-> +			rtc at 10300 {
+> +			rtc@10300 {
 > +				status = "disabled";
 > +			};
 > +
 > +			/* Connected to a header on device's PCB */
-> +			serial at 12000 {
+> +			serial@12000 {
 > +				status = "okay";
 > +			};
 > +
 > +			/* Connected to a Microchip PIC16F883 for power control */
-> +			serial at 12100 {
+> +			serial@12100 {
 > +				status = "okay";
 > +			};
 > +
-> +			poweroff at 12100 {
+> +			poweroff@12100 {
 > +				compatible = "synology,power-off";
 > +				reg = <0x12100 0x100>;
 > +				clocks = <&coreclk 0>;
@@ -410,5 +410,9 @@ Ah! It is also wrong in kirkwood-synology.dtsi
 > 
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel at lists.infradead.org
+> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+--
+To unsubscribe from this list: send the line "unsubscribe devicetree" in
+the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/a/content_digest b/N1/content_digest
index d50198a..791af01 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,23 @@
  "ref\0cover.1416095841.git.arno@natisbad.org\0"
  "ref\0909a6be242eeafa2cb5f096f3f2fc244f1b0880a.1416095841.git.arno@natisbad.org\0"
- "From\0andrew@lunn.ch (Andrew Lunn)\0"
- "Subject\0[PATCHv1 3/3] arm: mvebu: add .dts file for Synology DS414\0"
+ "ref\0909a6be242eeafa2cb5f096f3f2fc244f1b0880a.1416095841.git.arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org\0"
+ "From\0Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>\0"
+ "Subject\0Re: [PATCHv1 3/3] arm: mvebu: add .dts file for Synology DS414\0"
  "Date\0Sun, 16 Nov 2014 03:15:21 +0100\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Arnaud Ebalard <arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>\0"
+ "Cc\0Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>"
+  Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>
+  Gregory Clement <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
+  Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
+  Ben Peddell <klightspeed-aslSrjg9ejhWX4hkXwHRhw@public.gmane.org>
+  Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>
+  devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+  Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
+  Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>
+  Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
+  Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>
+  Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>
+ " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0"
  "\00:1\0"
  "b\0"
  "On Sun, Nov 16, 2014 at 01:04:34AM +0100, Arnaud Ebalard wrote:\n"
@@ -30,7 +44,7 @@
  "> directly connected to the SoC and under its control. The former are\n"
  "> presumably driven by the SATA controller, the latter by the PIC. \n"
  "> \n"
- "> Signed-off-by: Arnaud Ebalard <arno@natisbad.org>\n"
+ "> Signed-off-by: Arnaud Ebalard <arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>\n"
  "> ---\n"
  ">  arch/arm/boot/dts/Makefile                     |   3 +-\n"
  ">  arch/arm/boot/dts/armada-xp-synology-ds414.dts | 343 +++++++++++++++++++++++++\n"
@@ -60,7 +74,7 @@
  "> +/*\n"
  "> + * Device Tree file for Synology DS414\n"
  "> + *\n"
- "> + * Copyright (C) 2014, Arnaud EBALARD <arno@natisbad.org>\n"
+ "> + * Copyright (C) 2014, Arnaud EBALARD <arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>\n"
  "> + *\n"
  "> + * This program is free software; you can redistribute it and/or\n"
  "> + * modify it under the terms of the GNU General Public License\n"
@@ -113,7 +127,7 @@
  "> +\t\t\t * Connected to Marvell 88SX7042 SATA-II controller\n"
  "> +\t\t\t * handling the four disks.\n"
  "> +\t\t\t */\n"
- "> +\t\t\tpcie at 1,0 {\n"
+ "> +\t\t\tpcie@1,0 {\n"
  "> +\t\t\t\t/* Port 0, Lane 0 */\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\t\t\t};\n"
@@ -122,7 +136,7 @@
  "> +\t\t\t * Connected to EtronTech EJ168A XHCI controller\n"
  "> +\t\t\t * providing the two rear USB 3.0 ports.\n"
  "> +\t\t\t */\n"
- "> +\t\t\tpcie at 5,0 {\n"
+ "> +\t\t\tpcie@5,0 {\n"
  "> +\t\t\t\t/* Port 1, Lane 0 */\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\t\t\t};\n"
@@ -222,16 +236,16 @@
  "> +\t\t\t};\n"
  "> +\n"
  "> +\t\t\tmdio {\n"
- "> +\t\t\t\tphy0: ethernet-phy at 0 { /* Marvell 88E1512 */\n"
+ "> +\t\t\t\tphy0: ethernet-phy@0 { /* Marvell 88E1512 */\n"
  "> +\t\t\t\t\treg = <0>;\n"
  "> +\t\t\t\t};\n"
  "> +\n"
- "> +\t\t\t\tphy1: ethernet-phy at 1 { /* Marvell 88E1512 */\n"
+ "> +\t\t\t\tphy1: ethernet-phy@1 { /* Marvell 88E1512 */\n"
  "> +\t\t\t\t\treg = <1>;\n"
  "> +\t\t\t\t};\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tethernet at 70000 {\n"
+ "> +\t\t\tethernet@70000 {\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\t\t\t\tpinctrl-0 = <&pmx_ge0>;\n"
  "> +\t\t\t\tpinctrl-names = \"default\";\n"
@@ -239,7 +253,7 @@
  "> +\t\t\t\tphy-mode = \"rgmii-id\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tethernet at 74000 {\n"
+ "> +\t\t\tethernet@74000 {\n"
  "> +\t\t\t\tpinctrl-0 = <&pmx_ge1>;\n"
  "> +\t\t\t\tpinctrl-names = \"default\";\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
@@ -247,12 +261,12 @@
  "> +\t\t\t\tphy-mode = \"rgmii-id\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tspi0: spi at 10600 {\n"
+ "> +\t\t\tspi0: spi@10600 {\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\t\t\t\tpinctrl-0 = <&pmx_spi>;\n"
  "> +\t\t\t\tpinctrl-names = \"default\";\n"
  "> +\n"
- "> +\t\t\t\tspi-flash at 0 {\n"
+ "> +\t\t\t\tspi-flash@0 {\n"
  "> +\t\t\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t\t\t#size-cells = <1>;\n"
  "> +\t\t\t\t\tcompatible = \"micron,n25q064\";\n"
@@ -276,32 +290,32 @@
  "\n"
  "Seems to be a cut/paste of the 370 text. So same comments.\n"
  "\n"
- "> +\t\t\t\t\tpartition at 00000000 { /* u-boot */\n"
+ "> +\t\t\t\t\tpartition@00000000 { /* u-boot */\n"
  "> +\t\t\t\t\t\tlabel = \"RedBoot\";\n"
  "> +\t\t\t\t\t\treg = <0x00000000 0x000d0000>; /* 832KB */\n"
  "> +\t\t\t\t\t};\n"
  "> +\n"
- "> +\t\t\t\t\tpartition at 000c0000 { /* uImage */\n"
+ "> +\t\t\t\t\tpartition@000c0000 { /* uImage */\n"
  "> +\t\t\t\t\t\tlabel = \"zImage\";\n"
  "> +\t\t\t\t\t\treg = <0x000d0000 0x002d0000>; /* 2880KB */\n"
  "> +\t\t\t\t\t};\n"
  "> +\n"
- "> +\t\t\t\t\tpartition at 003a0000 { /* uInitramfs */\n"
+ "> +\t\t\t\t\tpartition@003a0000 { /* uInitramfs */\n"
  "> +\t\t\t\t\t\tlabel = \"rd.gz\";\n"
  "> +\t\t\t\t\t\treg = <0x003a0000 0x00430000>; /* 4250KB */\n"
  "> +\t\t\t\t\t};\n"
  "> +\n"
- "> +\t\t\t\t\tpartition at 007d0000 { /* MAC address and serial number */\n"
+ "> +\t\t\t\t\tpartition@007d0000 { /* MAC address and serial number */\n"
  "> +\t\t\t\t\t\tlabel = \"vendor\";\n"
  "> +\t\t\t\t\t\treg = <0x007d0000 0x00010000>; /* 64KB */\n"
  "> +\t\t\t\t\t};\n"
  "> +\n"
- "> +\t\t\t\t\tpartition at 007e0000 {\n"
+ "> +\t\t\t\t\tpartition@007e0000 {\n"
  "> +\t\t\t\t\t\tlabel = \"RedBoot config\";\n"
  "> +\t\t\t\t\t\treg = <0x007e0000 0x00010000>; /* 64KB */\n"
  "> +\t\t\t\t\t};\n"
  "> +\n"
- "> +\t\t\t\t\tpartition at 007f0000 {\n"
+ "> +\t\t\t\t\tpartition@007f0000 {\n"
  "> +\t\t\t\t\t\tlabel = \"FIS directory\";\n"
  "> +\t\t\t\t\t\treg = <0x007f0000 0x00010000>; /* 64KB */\n"
  "> +\t\t\t\t\t};\n"
@@ -309,15 +323,15 @@
  "> +\t\t\t};\n"
  "> +\n"
  "> +\t\t\t/* Front USB 2.0 port */\n"
- "> +\t\t\tusb at 50000 {\n"
+ "> +\t\t\tusb@50000 {\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\ti2c at 11000 {\n"
+ "> +\t\t\ti2c@11000 {\n"
  "> +\t\t\t\tclock-frequency = <400000>;\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\n"
- "> +\t\t\t\ts35390a: s35390a at 30 {\n"
+ "> +\t\t\t\ts35390a: s35390a@30 {\n"
  "> +\t\t\t\t\t compatible = \"ssi,s35390a\";\n"
  "\n"
  "sii\n"
@@ -329,21 +343,21 @@
  "> +\t\t\t};\n"
  "> +\n"
  "> +\t\t\t/* RTC is provided by Seiko S-35390A above */\n"
- "> +\t\t\trtc at 10300 {\n"
+ "> +\t\t\trtc@10300 {\n"
  "> +\t\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t};\n"
  "> +\n"
  "> +\t\t\t/* Connected to a header on device's PCB */\n"
- "> +\t\t\tserial at 12000 {\n"
+ "> +\t\t\tserial@12000 {\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\t\t\t};\n"
  "> +\n"
  "> +\t\t\t/* Connected to a Microchip PIC16F883 for power control */\n"
- "> +\t\t\tserial at 12100 {\n"
+ "> +\t\t\tserial@12100 {\n"
  "> +\t\t\t\tstatus = \"okay\";\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tpoweroff at 12100 {\n"
+ "> +\t\t\tpoweroff@12100 {\n"
  "> +\t\t\t\tcompatible = \"synology,power-off\";\n"
  "> +\t\t\t\treg = <0x12100 0x100>;\n"
  "> +\t\t\t\tclocks = <&coreclk 0>;\n"
@@ -418,7 +432,11 @@
  "> \n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel at lists.infradead.org\n"
- > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+ "> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\n"
+ "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
+ "--\n"
+ "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n"
+ "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n"
+ More majordomo info at  http://vger.kernel.org/majordomo-info.html
 
-24f944219c1cfd50aa05aad216cc32ec5e55f45610c4895abb9979790b7176a5
+df6e87f54b858fddced10659ea1f82810aa23208954849ee8b21caf63e4f2139
