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

diff --git a/a/1.txt b/N1/1.txt
index faf9bba..eb1d5c0 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,10 +1,10 @@
 Hi,
  
- On ven., déc. 15 2017, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote:
+ On ven., d?c. 15 2017, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote:
 
 > 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
@@ -58,19 +58,19 @@ mvebu/dt64-nand
 >> -	marvell,nand-enable-arbiter;
 >> -	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>;
 >> +		label = "pxa3xx_nand-0";
 >> +		marvell,rb = <0>;
@@ -83,17 +83,17 @@ mvebu/dt64-nand
 >> +			#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>;
 >> +			};
@@ -114,8 +114,8 @@ mvebu/dt64-nand
 >>  				status = "disabled";
 >>  			};
 >>  
->> -			cpm_nand: nand@720000 {
->> +			cpm_nand_controller: nand@720000 {
+>> -			cpm_nand: nand at 720000 {
+>> +			cpm_nand_controller: nand at 720000 {
 >>  				/*
 >>  				 * Due to the limiation of the pin available
 >>  				 * this controller is only usable on the CPM
@@ -138,7 +138,7 @@ mvebu/dt64-nand
 >>
 >> _______________________________________________
 >> 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 6cc6a12..52d9a78 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,47 +1,19 @@
  "ref\020171207201814.30411-1-miquel.raynal@free-electrons.com\0"
  "ref\020171207201814.30411-12-miquel.raynal@free-electrons.com\0"
  "ref\087374cmghe.fsf@free-electrons.com\0"
- "From\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0"
- "Subject\0Re: [PATCH 11/12] ARM64: dts: marvell: use reworked NAND controller driver on Armada 7K\0"
+ "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0"
+ "Subject\0[PATCH 11/12] ARM64: dts: marvell: use reworked NAND controller driver on Armada 7K\0"
  "Date\0Fri, 15 Dec 2017 11:44:08 +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,\n"
  " \n"
- " On ven., d\303\251c. 15 2017, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote:\n"
+ " On ven., d?c. 15 2017, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote:\n"
  "\n"
  "> 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"
@@ -95,19 +67,19 @@
  ">> -\tmarvell,nand-enable-arbiter;\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\tlabel = \"pxa3xx_nand-0\";\n"
  ">> +\t\tmarvell,rb = <0>;\n"
@@ -120,17 +92,17 @@
  ">> +\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"
  ">> +\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"
  ">> +\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"
@@ -151,8 +123,8 @@
  ">>  \t\t\t\tstatus = \"disabled\";\n"
  ">>  \t\t\t};\n"
  ">>  \n"
- ">> -\t\t\tcpm_nand: nand@720000 {\n"
- ">> +\t\t\tcpm_nand_controller: nand@720000 {\n"
+ ">> -\t\t\tcpm_nand: nand at 720000 {\n"
+ ">> +\t\t\tcpm_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"
@@ -175,7 +147,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"
@@ -190,4 +162,4 @@
  "development, consulting, training and support.\n"
  http://free-electrons.com
 
-ca3d06bc8f681fce7115ecb0f664fc9ea5901f6605df992783ab4ac0fc07cd5e
+dcf931ef0d4fbe487890c9c915fd3cbde1c141e362f73c318cc8cb45235e3c7f
