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

diff --git a/a/1.txt b/N1/1.txt
index 919ed97..c00e872 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,6 +1,6 @@
 Hi Miquel,
  
- On jeu., déc. 07 2017, Miquel Raynal <miquel.raynal@free-electrons.com> wrote:
+ On jeu., d?c. 07 2017, Miquel Raynal <miquel.raynal@free-electrons.com> wrote:
 
 > Use the new bindings of the reworked Marvell NAND controller driver.
 > Also adapt the nand controller node organization to distinguish which
@@ -43,19 +43,19 @@ Gregory
 > -	marvell,system-controller = <&cps_syscon0>;
 > -	nand-on-flash-bbt;
 > -
-> -	partition@0 {
+> -	partition at 0 {
 > -		label = "U-Boot";
 > -		reg = <0 0x200000>;
 > -	};
-> -	partition@200000 {
+> -	partition at 200000 {
 > -		label = "Linux";
 > -		reg = <0x200000 0xe00000>;
 > -	};
-> -	partition@1000000 {
+> -	partition at 1000000 {
 > -		label = "Filesystem";
 > -		reg = <0x1000000 0x3f000000>;
 > +
-> +	nand@0 {
+> +	nand at 0 {
 > +		reg = <0>;
 > +		marvell,rb = <0>;
 > +		nand-on-flash-bbt;
@@ -67,15 +67,15 @@ Gregory
 > +			#address-cells = <1>;
 > +			#size-cells = <1>;
 > +
-> +			partition@0 {
+> +			partition at 0 {
 > +				label = "U-Boot";
 > +				reg = <0 0x200000>;
 > +			};
-> +			partition@200000 {
+> +			partition at 200000 {
 > +				label = "Linux";
 > +				reg = <0x200000 0xe00000>;
 > +			};
-> +			partition@1000000 {
+> +			partition at 1000000 {
 > +				label = "Filesystem";
 > +				reg = <0x1000000 0x3f000000>;
 > +			};
@@ -91,8 +91,8 @@ Gregory
 >  				status = "disabled";
 >  			};
 >  
-> -			cps_nand: nand@720000 {
-> +			cps_nand_controller: nand@720000 {
+> -			cps_nand: nand at 720000 {
+> +			cps_nand_controller: nand at 720000 {
 >  				/*
 >  				 * Due to the limiation of the pin available
 >  				 * this controller is only usable on the CPM
@@ -119,7 +119,7 @@ Gregory
 >
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel@lists.infradead.org
+> linux-arm-kernel at lists.infradead.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
 -- 
diff --git a/a/content_digest b/N1/content_digest
index 87d5861..c9ac881 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,42 +1,14 @@
  "ref\020171207201814.30411-1-miquel.raynal@free-electrons.com\0"
  "ref\020171207201814.30411-13-miquel.raynal@free-electrons.com\0"
- "From\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0"
- "Subject\0Re: [PATCH 12/12] ARM64: dts: marvell: use reworked NAND controller driver on Armada 8K\0"
+ "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0"
+ "Subject\0[PATCH 12/12] ARM64: dts: marvell: use reworked NAND controller driver on Armada 8K\0"
  "Date\0Fri, 15 Dec 2017 11:29:49 +0100\0"
- "To\0Miquel Raynal <miquel.raynal@free-electrons.com>\0"
- "Cc\0David Woodhouse <dwmw2@infradead.org>"
-  Brian Norris <computersforpeace@gmail.com>
-  Boris Brezillon <boris.brezillon@free-electrons.com>
-  Marek Vasut <marek.vasut@gmail.com>
-  Richard Weinberger <richard@nod.at>
-  Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
-  Rob Herring <robh+dt@kernel.org>
-  Mark Rutland <mark.rutland@arm.com>
-  Jason Cooper <jason@lakedaemon.net>
-  Andrew Lunn <andrew@lunn.ch>
-  Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
-  Russell King <linux@armlinux.org.uk>
-  Daniel Mack <daniel@zonque.org>
-  Haojian Zhuang <haojian.zhuang@gmail.com>
-  Robert Jarzmik <robert.jarzmik@free.fr>
-  Eric Miao <eric.y.miao@gmail.com>
-  Catalin Marinas <catalin.marinas@arm.com>
-  Will Deacon <will.deacon@arm.com>
-  Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
-  Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-  devicetree@vger.kernel.org
-  Antoine Tenart <antoine.tenart@free-electrons.com>
-  Nadav Haklai <nadavh@marvell.com>
-  linux-mtd@lists.infradead. org
-  Neta Zur Hershkovits <neta@marvell.com>
-  Hanna Hawa <hannah@marvell.com>
-  Ofer Heifetz <oferh@marvell.com>
- " linux-arm-kernel@lists.infradead.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hi Miquel,\n"
  " \n"
- " On jeu., d\303\251c. 07 2017, Miquel Raynal <miquel.raynal@free-electrons.com> wrote:\n"
+ " On jeu., d?c. 07 2017, Miquel Raynal <miquel.raynal@free-electrons.com> wrote:\n"
  "\n"
  "> Use the new bindings of the reworked Marvell NAND controller driver.\n"
  "> Also adapt the nand controller node organization to distinguish which\n"
@@ -79,19 +51,19 @@
  "> -\tmarvell,system-controller = <&cps_syscon0>;\n"
  "> -\tnand-on-flash-bbt;\n"
  "> -\n"
- "> -\tpartition@0 {\n"
+ "> -\tpartition at 0 {\n"
  "> -\t\tlabel = \"U-Boot\";\n"
  "> -\t\treg = <0 0x200000>;\n"
  "> -\t};\n"
- "> -\tpartition@200000 {\n"
+ "> -\tpartition at 200000 {\n"
  "> -\t\tlabel = \"Linux\";\n"
  "> -\t\treg = <0x200000 0xe00000>;\n"
  "> -\t};\n"
- "> -\tpartition@1000000 {\n"
+ "> -\tpartition at 1000000 {\n"
  "> -\t\tlabel = \"Filesystem\";\n"
  "> -\t\treg = <0x1000000 0x3f000000>;\n"
  "> +\n"
- "> +\tnand@0 {\n"
+ "> +\tnand at 0 {\n"
  "> +\t\treg = <0>;\n"
  "> +\t\tmarvell,rb = <0>;\n"
  "> +\t\tnand-on-flash-bbt;\n"
@@ -103,15 +75,15 @@
  "> +\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t#size-cells = <1>;\n"
  "> +\n"
- "> +\t\t\tpartition@0 {\n"
+ "> +\t\t\tpartition at 0 {\n"
  "> +\t\t\t\tlabel = \"U-Boot\";\n"
  "> +\t\t\t\treg = <0 0x200000>;\n"
  "> +\t\t\t};\n"
- "> +\t\t\tpartition@200000 {\n"
+ "> +\t\t\tpartition at 200000 {\n"
  "> +\t\t\t\tlabel = \"Linux\";\n"
  "> +\t\t\t\treg = <0x200000 0xe00000>;\n"
  "> +\t\t\t};\n"
- "> +\t\t\tpartition@1000000 {\n"
+ "> +\t\t\tpartition at 1000000 {\n"
  "> +\t\t\t\tlabel = \"Filesystem\";\n"
  "> +\t\t\t\treg = <0x1000000 0x3f000000>;\n"
  "> +\t\t\t};\n"
@@ -127,8 +99,8 @@
  ">  \t\t\t\tstatus = \"disabled\";\n"
  ">  \t\t\t};\n"
  ">  \n"
- "> -\t\t\tcps_nand: nand@720000 {\n"
- "> +\t\t\tcps_nand_controller: nand@720000 {\n"
+ "> -\t\t\tcps_nand: nand at 720000 {\n"
+ "> +\t\t\tcps_nand_controller: nand at 720000 {\n"
  ">  \t\t\t\t/*\n"
  ">  \t\t\t\t * Due to the limiation of the pin available\n"
  ">  \t\t\t\t * this controller is only usable on the CPM\n"
@@ -155,7 +127,7 @@
  ">\n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel@lists.infradead.org\n"
+ "> linux-arm-kernel at lists.infradead.org\n"
  "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
  "\n"
  "-- \n"
@@ -164,4 +136,4 @@
  "development, consulting, training and support.\n"
  http://free-electrons.com
 
-4e264edd72bb6b6eb86544bd2882a4192aa423f77940cacddeed37e2a4431ff4
+dfea2c09cf8ed61f2d50e254f5a7fbc3fd8e1fe5128aada3552bcbbf67396fe5
