diff for duplicates of <87o9crgco1.fsf@bootlin.com>

diff --git a/a/1.txt b/N1/1.txt
index 6ee5bf5..30c7189 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,6 +1,6 @@
 Hi Miquel,
  
- On jeu., ao?t 30 2018, Miquel Raynal <miquel.raynal@bootlin.com> wrote:
+ On jeu., août 30 2018, Miquel Raynal <miquel.raynal@bootlin.com> wrote:
 
 > New bindings impose to declare the thermal IP from within a new syscon.
 >
@@ -25,17 +25,17 @@ Gregory
 >  				};
 >  			};
 >  
-> -			ap_thermal: thermal at 6f808c {
+> -			ap_thermal: thermal@6f808c {
 > -				compatible = "marvell,armada-ap806-thermal";
 > -				reg = <0x6f808c 0x4>,
 > -				      <0x6f8084 0x8>;
-> +			ap_syscon1: system-controller at 6f8000 {
+> +			ap_syscon1: system-controller@6f8000 {
 > +				compatible = "syscon", "simple-mfd";
 > +				reg = <0x6f8000 0x1000>;
 > +				#address-cells = <1>;
 > +				#size-cells = <1>;
 > +
-> +				ap_thermal: thermal-sensor at 80 {
+> +				ap_thermal: thermal-sensor@80 {
 > +					compatible = "marvell,armada-ap806-thermal";
 > +					reg = <0x80 0x10>;
 > +				};
@@ -50,32 +50,32 @@ Gregory
 >  			interrupts = <77 IRQ_TYPE_LEVEL_HIGH>;
 >  		};
 >  
-> -		CP110_LABEL(thermal): thermal at 400078 {
+> -		CP110_LABEL(thermal): thermal@400078 {
 > -			compatible = "marvell,armada-cp110-thermal";
 > -			reg = <0x400078 0x4>,
 > -			<0x400070 0x8>;
 > -		};
 > -
->  		CP110_LABEL(syscon0): system-controller at 440000 {
+>  		CP110_LABEL(syscon0): system-controller@440000 {
 >  			compatible = "syscon", "simple-mfd";
 >  			reg = <0x440000 0x2000>;
 > @@ -223,6 +217,18 @@
 >  			};
 >  		};
 >  
-> +		CP110_LABEL(syscon1): system-controller at 400000 {
+> +		CP110_LABEL(syscon1): system-controller@400000 {
 > +			compatible = "syscon", "simple-mfd";
 > +			reg = <0x400000 0x1000>;
 > +			#address-cells = <1>;
 > +			#size-cells = <1>;
 > +
-> +			CP110_LABEL(thermal): thermal-sensor at 70 {
+> +			CP110_LABEL(thermal): thermal-sensor@70 {
 > +				compatible = "marvell,armada-cp110-thermal";
 > +				reg = <0x70 0x10>;
 > +			};
 > +		};
 > +
->  		CP110_LABEL(usb3_0): usb3 at 500000 {
+>  		CP110_LABEL(usb3_0): usb3@500000 {
 >  			compatible = "marvell,armada-8k-xhci",
 >  			"generic-xhci";
 > -- 
@@ -86,3 +86,8 @@ Gregory
 Gregory Clement, Bootlin
 Embedded Linux and Kernel engineering
 http://bootlin.com
+
+_______________________________________________
+linux-arm-kernel mailing list
+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 94dd03e..3f60f31 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,13 +1,23 @@
  "ref\020180830081501.11569-1-miquel.raynal@bootlin.com\0"
- "From\0gregory.clement@bootlin.com (Gregory CLEMENT)\0"
- "Subject\0[RESEND PATCH 1/4] arm64: dts: marvell: move AP806/CP110 thermal nodes into a new syscon\0"
+ "From\0Gregory CLEMENT <gregory.clement@bootlin.com>\0"
+ "Subject\0Re: [RESEND PATCH 1/4] arm64: dts: marvell: move AP806/CP110 thermal nodes into a new syscon\0"
  "Date\0Fri, 21 Sep 2018 16:14:54 +0200\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Miquel Raynal <miquel.raynal@bootlin.com>\0"
+ "Cc\0Andrew Lunn <andrew@lunn.ch>"
+  Jason Cooper <jason@lakedaemon.net>
+  devicetree@vger.kernel.org
+  Antoine Tenart <antoine.tenart@bootlin.com>
+  Maxime Chevallier <maxime.chevallier@bootlin.com>
+  Nadav Haklai <nadavh@marvell.com>
+  Rob Herring <robh+dt@kernel.org>
+  Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+  linux-arm-kernel@lists.infradead.org
+ " Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0"
  "\00:1\0"
  "b\0"
  "Hi Miquel,\n"
  " \n"
- " On jeu., ao?t 30 2018, Miquel Raynal <miquel.raynal@bootlin.com> wrote:\n"
+ " On jeu., ao\303\273t 30 2018, Miquel Raynal <miquel.raynal@bootlin.com> wrote:\n"
  "\n"
  "> New bindings impose to declare the thermal IP from within a new syscon.\n"
  ">\n"
@@ -32,17 +42,17 @@
  ">  \t\t\t\t};\n"
  ">  \t\t\t};\n"
  ">  \n"
- "> -\t\t\tap_thermal: thermal at 6f808c {\n"
+ "> -\t\t\tap_thermal: thermal@6f808c {\n"
  "> -\t\t\t\tcompatible = \"marvell,armada-ap806-thermal\";\n"
  "> -\t\t\t\treg = <0x6f808c 0x4>,\n"
  "> -\t\t\t\t      <0x6f8084 0x8>;\n"
- "> +\t\t\tap_syscon1: system-controller at 6f8000 {\n"
+ "> +\t\t\tap_syscon1: system-controller@6f8000 {\n"
  "> +\t\t\t\tcompatible = \"syscon\", \"simple-mfd\";\n"
  "> +\t\t\t\treg = <0x6f8000 0x1000>;\n"
  "> +\t\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t\t#size-cells = <1>;\n"
  "> +\n"
- "> +\t\t\t\tap_thermal: thermal-sensor at 80 {\n"
+ "> +\t\t\t\tap_thermal: thermal-sensor@80 {\n"
  "> +\t\t\t\t\tcompatible = \"marvell,armada-ap806-thermal\";\n"
  "> +\t\t\t\t\treg = <0x80 0x10>;\n"
  "> +\t\t\t\t};\n"
@@ -57,32 +67,32 @@
  ">  \t\t\tinterrupts = <77 IRQ_TYPE_LEVEL_HIGH>;\n"
  ">  \t\t};\n"
  ">  \n"
- "> -\t\tCP110_LABEL(thermal): thermal at 400078 {\n"
+ "> -\t\tCP110_LABEL(thermal): thermal@400078 {\n"
  "> -\t\t\tcompatible = \"marvell,armada-cp110-thermal\";\n"
  "> -\t\t\treg = <0x400078 0x4>,\n"
  "> -\t\t\t<0x400070 0x8>;\n"
  "> -\t\t};\n"
  "> -\n"
- ">  \t\tCP110_LABEL(syscon0): system-controller at 440000 {\n"
+ ">  \t\tCP110_LABEL(syscon0): system-controller@440000 {\n"
  ">  \t\t\tcompatible = \"syscon\", \"simple-mfd\";\n"
  ">  \t\t\treg = <0x440000 0x2000>;\n"
  "> @@ -223,6 +217,18 @@\n"
  ">  \t\t\t};\n"
  ">  \t\t};\n"
  ">  \n"
- "> +\t\tCP110_LABEL(syscon1): system-controller at 400000 {\n"
+ "> +\t\tCP110_LABEL(syscon1): system-controller@400000 {\n"
  "> +\t\t\tcompatible = \"syscon\", \"simple-mfd\";\n"
  "> +\t\t\treg = <0x400000 0x1000>;\n"
  "> +\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t#size-cells = <1>;\n"
  "> +\n"
- "> +\t\t\tCP110_LABEL(thermal): thermal-sensor at 70 {\n"
+ "> +\t\t\tCP110_LABEL(thermal): thermal-sensor@70 {\n"
  "> +\t\t\t\tcompatible = \"marvell,armada-cp110-thermal\";\n"
  "> +\t\t\t\treg = <0x70 0x10>;\n"
  "> +\t\t\t};\n"
  "> +\t\t};\n"
  "> +\n"
- ">  \t\tCP110_LABEL(usb3_0): usb3 at 500000 {\n"
+ ">  \t\tCP110_LABEL(usb3_0): usb3@500000 {\n"
  ">  \t\t\tcompatible = \"marvell,armada-8k-xhci\",\n"
  ">  \t\t\t\"generic-xhci\";\n"
  "> -- \n"
@@ -92,6 +102,11 @@
  "-- \n"
  "Gregory Clement, Bootlin\n"
  "Embedded Linux and Kernel engineering\n"
- http://bootlin.com
+ "http://bootlin.com\n"
+ "\n"
+ "_______________________________________________\n"
+ "linux-arm-kernel mailing list\n"
+ "linux-arm-kernel@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-840ddae5921b0e461a64553595aee4640b60803b4b6310ff6a43d4af94a2360e
+001ab0cb67ec03007e16ba289334289910287761ff742a81ecc454f59b7a17ea
