diff for duplicates of <87lh9f607r.fsf@free-electrons.com>

diff --git a/a/1.txt b/N1/1.txt
index 204a3d7..5d03ecf 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -26,9 +26,9 @@ Gregory
 > Cc: Kumar Gala <galak@codeaurora.org> 
 > Cc: Russell King <linux@arm.linux.org.uk> 
 > Cc: Benoit Masson <yahoo@perenite.com>
-> Cc: linux-arm-kernel at lists.infradead.org 
-> Cc: devicetree at vger.kernel.org 
-> Cc: linux-kernel at vger.kernel.org 
+> Cc: linux-arm-kernel@lists.infradead.org 
+> Cc: devicetree@vger.kernel.org 
+> Cc: linux-kernel@vger.kernel.org 
 > ---
 >  arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 67 +++++++++++++------------
 >  1 file changed, 36 insertions(+), 31 deletions(-)
@@ -41,70 +41,70 @@ Gregory
 >  				marvell,nand-enable-arbiter;
 >  				nand-on-flash-bbt;
 >  
-> -				partition at 0 {
+> -				partition@0 {
 > -					label = "u-boot";
 > -					reg = <0x0000000 0xe0000>;
 > -					read-only;
 > -				};
 > -
-> -				partition at e0000 {
+> -				partition@e0000 {
 > -					label = "u-boot-env";
 > -					reg = <0xe0000 0x20000>;
 > -					read-only;
 > -				};
 > -
-> -				partition at 100000 {
+> -				partition@100000 {
 > -					label = "u-boot-env2";
 > -					reg = <0x100000 0x20000>;
 > -					read-only;
 > -				};
 > -
-> -				partition at 120000 {
+> -				partition@120000 {
 > -					label = "zImage";
 > -					reg = <0x120000 0x400000>;
 > -				};
 > -
-> -				partition at 520000 {
+> -				partition@520000 {
 > -					label = "initrd";
 > -					reg = <0x520000 0x400000>;
 > -				};
 > -
-> -				partition at xE00000 {
+> -				partition@xE00000 {
 > -					label = "boot";
 > -					reg = <0xE00000 0x3F200000>;
 > +				partitions {
 > +					#address-cells = <1>;
 > +					#size-cells = <1>;
 > +
-> +					partition at 0 {
+> +					partition@0 {
 > +						label = "u-boot";
 > +						reg = <0x0000000 0xe0000>;
 > +						read-only;
 > +					};
 > +
-> +					partition at e0000 {
+> +					partition@e0000 {
 > +						label = "u-boot-env";
 > +						reg = <0xe0000 0x20000>;
 > +						read-only;
 > +					};
 > +
-> +					partition at 100000 {
+> +					partition@100000 {
 > +						label = "u-boot-env2";
 > +						reg = <0x100000 0x20000>;
 > +						read-only;
 > +					};
 > +
-> +					partition at 120000 {
+> +					partition@120000 {
 > +						label = "zImage";
 > +						reg = <0x120000 0x400000>;
 > +					};
 > +
-> +					partition at 520000 {
+> +					partition@520000 {
 > +						label = "initrd";
 > +						reg = <0x520000 0x400000>;
 > +					};
 > +
-> +					partition at xE00000 {
+> +					partition@xE00000 {
 > +						label = "boot";
 > +						reg = <0xE00000 0x3F200000>;
 > +					};
@@ -117,7 +117,7 @@ Gregory
 >
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel at lists.infradead.org
+> linux-arm-kernel@lists.infradead.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
 -- 
diff --git a/a/content_digest b/N1/content_digest
index 873add5..d657d3e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,21 @@
  "ref\01448709248-21177-1-git-send-email-sebastian.hesselbarth@gmail.com\0"
  "ref\01448709248-21177-3-git-send-email-sebastian.hesselbarth@gmail.com\0"
- "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0"
- "Subject\0[PATCH 2/4] ARM: dt: mvebu: ix4-300d: move partitions to partition sub-node\0"
+ "From\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0"
+ "Subject\0Re: [PATCH 2/4] ARM: dt: mvebu: ix4-300d: move partitions to partition sub-node\0"
  "Date\0Mon, 30 Nov 2015 15:17:12 +0100\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0"
+ "Cc\0Mark Rutland <mark.rutland@arm.com>"
+  Andrew Lunn <andrew@lunn.ch>
+  Russell King <linux@arm.linux.org.uk>
+  Jason Cooper <jason@lakedaemon.net>
+  Pawel Moll <pawel.moll@arm.com>
+  Ian Campbell <ijc+devicetree@hellion.org.uk>
+  linux-kernel@vger.kernel.org
+  devicetree@vger.kernel.org
+  Rob Herring <robh+dt@kernel.org>
+  Kumar Gala <galak@codeaurora.org>
+  Benoit Masson <yahoo@perenite.com>
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hi Sebastian,\n"
@@ -34,9 +46,9 @@
  "> Cc: Kumar Gala <galak@codeaurora.org> \n"
  "> Cc: Russell King <linux@arm.linux.org.uk> \n"
  "> Cc: Benoit Masson <yahoo@perenite.com>\n"
- "> Cc: linux-arm-kernel at lists.infradead.org \n"
- "> Cc: devicetree at vger.kernel.org \n"
- "> Cc: linux-kernel at vger.kernel.org \n"
+ "> Cc: linux-arm-kernel@lists.infradead.org \n"
+ "> Cc: devicetree@vger.kernel.org \n"
+ "> Cc: linux-kernel@vger.kernel.org \n"
  "> ---\n"
  ">  arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 67 +++++++++++++------------\n"
  ">  1 file changed, 36 insertions(+), 31 deletions(-)\n"
@@ -49,70 +61,70 @@
  ">  \t\t\t\tmarvell,nand-enable-arbiter;\n"
  ">  \t\t\t\tnand-on-flash-bbt;\n"
  ">  \n"
- "> -\t\t\t\tpartition at 0 {\n"
+ "> -\t\t\t\tpartition@0 {\n"
  "> -\t\t\t\t\tlabel = \"u-boot\";\n"
  "> -\t\t\t\t\treg = <0x0000000 0xe0000>;\n"
  "> -\t\t\t\t\tread-only;\n"
  "> -\t\t\t\t};\n"
  "> -\n"
- "> -\t\t\t\tpartition at e0000 {\n"
+ "> -\t\t\t\tpartition@e0000 {\n"
  "> -\t\t\t\t\tlabel = \"u-boot-env\";\n"
  "> -\t\t\t\t\treg = <0xe0000 0x20000>;\n"
  "> -\t\t\t\t\tread-only;\n"
  "> -\t\t\t\t};\n"
  "> -\n"
- "> -\t\t\t\tpartition at 100000 {\n"
+ "> -\t\t\t\tpartition@100000 {\n"
  "> -\t\t\t\t\tlabel = \"u-boot-env2\";\n"
  "> -\t\t\t\t\treg = <0x100000 0x20000>;\n"
  "> -\t\t\t\t\tread-only;\n"
  "> -\t\t\t\t};\n"
  "> -\n"
- "> -\t\t\t\tpartition at 120000 {\n"
+ "> -\t\t\t\tpartition@120000 {\n"
  "> -\t\t\t\t\tlabel = \"zImage\";\n"
  "> -\t\t\t\t\treg = <0x120000 0x400000>;\n"
  "> -\t\t\t\t};\n"
  "> -\n"
- "> -\t\t\t\tpartition at 520000 {\n"
+ "> -\t\t\t\tpartition@520000 {\n"
  "> -\t\t\t\t\tlabel = \"initrd\";\n"
  "> -\t\t\t\t\treg = <0x520000 0x400000>;\n"
  "> -\t\t\t\t};\n"
  "> -\n"
- "> -\t\t\t\tpartition at xE00000 {\n"
+ "> -\t\t\t\tpartition@xE00000 {\n"
  "> -\t\t\t\t\tlabel = \"boot\";\n"
  "> -\t\t\t\t\treg = <0xE00000 0x3F200000>;\n"
  "> +\t\t\t\tpartitions {\n"
  "> +\t\t\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t\t\t#size-cells = <1>;\n"
  "> +\n"
- "> +\t\t\t\t\tpartition at 0 {\n"
+ "> +\t\t\t\t\tpartition@0 {\n"
  "> +\t\t\t\t\t\tlabel = \"u-boot\";\n"
  "> +\t\t\t\t\t\treg = <0x0000000 0xe0000>;\n"
  "> +\t\t\t\t\t\tread-only;\n"
  "> +\t\t\t\t\t};\n"
  "> +\n"
- "> +\t\t\t\t\tpartition at e0000 {\n"
+ "> +\t\t\t\t\tpartition@e0000 {\n"
  "> +\t\t\t\t\t\tlabel = \"u-boot-env\";\n"
  "> +\t\t\t\t\t\treg = <0xe0000 0x20000>;\n"
  "> +\t\t\t\t\t\tread-only;\n"
  "> +\t\t\t\t\t};\n"
  "> +\n"
- "> +\t\t\t\t\tpartition at 100000 {\n"
+ "> +\t\t\t\t\tpartition@100000 {\n"
  "> +\t\t\t\t\t\tlabel = \"u-boot-env2\";\n"
  "> +\t\t\t\t\t\treg = <0x100000 0x20000>;\n"
  "> +\t\t\t\t\t\tread-only;\n"
  "> +\t\t\t\t\t};\n"
  "> +\n"
- "> +\t\t\t\t\tpartition at 120000 {\n"
+ "> +\t\t\t\t\tpartition@120000 {\n"
  "> +\t\t\t\t\t\tlabel = \"zImage\";\n"
  "> +\t\t\t\t\t\treg = <0x120000 0x400000>;\n"
  "> +\t\t\t\t\t};\n"
  "> +\n"
- "> +\t\t\t\t\tpartition at 520000 {\n"
+ "> +\t\t\t\t\tpartition@520000 {\n"
  "> +\t\t\t\t\t\tlabel = \"initrd\";\n"
  "> +\t\t\t\t\t\treg = <0x520000 0x400000>;\n"
  "> +\t\t\t\t\t};\n"
  "> +\n"
- "> +\t\t\t\t\tpartition at xE00000 {\n"
+ "> +\t\t\t\t\tpartition@xE00000 {\n"
  "> +\t\t\t\t\t\tlabel = \"boot\";\n"
  "> +\t\t\t\t\t\treg = <0xE00000 0x3F200000>;\n"
  "> +\t\t\t\t\t};\n"
@@ -125,7 +137,7 @@
  ">\n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel at lists.infradead.org\n"
+ "> linux-arm-kernel@lists.infradead.org\n"
  "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
  "\n"
  "-- \n"
@@ -134,4 +146,4 @@
  "development, consulting, training and support.\n"
  http://free-electrons.com
 
-47100dcd73ebb9e5c109c56f0c6e6883c9d49c9b62f6e3d8fec580ae40840c7f
+470ecfdc205e6d4ff63489ad807be0d5e86a6966d8592a1706544ed9a9ff12b6
