diff for duplicates of <20170110064935.GB20956@dragon>

diff --git a/a/1.txt b/N1/1.txt
index 4fdb861..fca5c2c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,4 +1,4 @@
-On Mon, Jan 09, 2017 at 05:00:18PM +0100, S?bastien Szymanski wrote:
+On Mon, Jan 09, 2017 at 05:00:18PM +0100, Sébastien Szymanski wrote:
 > OPOS6UL is an i.MX6UL based SoM.
 > OPOS6ULDev is a carrier board for the OPOS6UL SoM.
 > 
@@ -6,7 +6,7 @@ On Mon, Jan 09, 2017 at 05:00:18PM +0100, S?bastien Szymanski wrote:
 > http://www.opossom.com/english/products-processor_boards-opos6ul.html
 > http://www.opossom.com/english/products-development_boards-opos6ul_dev.html
 > 
-> Signed-off-by: S?bastien Szymanski <sebastien.szymanski@armadeus.com>
+> Signed-off-by: Sébastien Szymanski <sebastien.szymanski-d2DlULPkwbNWk0Htik3J/w@public.gmane.org>
 
 s/AND/and in patch subject.
 
@@ -37,7 +37,7 @@ s/AND/and in patch subject.
 > +++ b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
 > @@ -0,0 +1,192 @@
 > +/*
-> + * Copyright 2016 Armadeus Systems <support@armadeus.com>
+> + * Copyright 2016 Armadeus Systems <support-d2DlULPkwbNWk0Htik3J/w@public.gmane.org>
 > + *
 > + * This file is dual-licensed: you can use it either under the terms
 > + * of the GPL or the X11 license, at your option. Note that this dual
@@ -117,7 +117,7 @@ s/AND/and in patch subject.
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +
-> +		ethphy1: ethernet-phy at 1 {
+> +		ethphy1: ethernet-phy@1 {
 > +			compatible = "ethernet-phy-ieee802.3-c22";
 > +			reg = <1>;
 > +			interrupt-parent = <&gpio4>;
@@ -161,7 +161,7 @@ Use generic one "uart-has-rtscts" instead.
 > +	#address-cells = <1>;
 > +	#size-cells = <0>;
 > +
-> +	brcmf: bcrmf at 1 {
+> +	brcmf: bcrmf@1 {
 > +		compatible = "brcm,bcm4329-fmac";
 > +		reg = <1>;
 > +		interrupt-parent = <&gpio2>;
@@ -238,7 +238,7 @@ Use generic one "uart-has-rtscts" instead.
 > +++ b/arch/arm/boot/dts/imx6ul-opos6uldev.dts
 > @@ -0,0 +1,414 @@
 > +/*
-> + * Copyright 2016 Armadeus Systems <support@armadeus.com>
+> + * Copyright 2016 Armadeus Systems <support-d2DlULPkwbNWk0Htik3J/w@public.gmane.org>
 > + *
 > + * This file is dual-licensed: you can use it either under the terms
 > + * of the GPL or the X11 license, at your option. Note that this dual
@@ -416,13 +416,13 @@ This property is obsolete.  Drop it.
 > +	cs-gpios = <&gpio4 9 GPIO_ACTIVE_LOW>, <&gpio4 3 GPIO_ACTIVE_LOW>;
 > +	status = "okay";
 > +
-> +	spidev0: spi at 0 {
+> +	spidev0: spi@0 {
 > +		compatible = "spidev";
 > +		reg = <0>;
 > +		spi-max-frequency = <5000000>;
 > +	};
 > +
-> +	spidev1: spi at 1 {
+> +	spidev1: spi@1 {
 > +		compatible = "spidev";
 > +		reg = <1>;
 > +		spi-max-frequency = <5000000>;
@@ -691,5 +691,9 @@ Shawn
 > 
 > _______________________________________________
 > 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 fdc7ed8..04b9ae9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,11 +1,21 @@
  "ref\01483977618-18298-1-git-send-email-sebastien.szymanski@armadeus.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH 1/1] ARM: dts: add Armadeus Systems OPOS6UL AND OPOS6ULDEV support\0"
+ "ref\01483977618-18298-1-git-send-email-sebastien.szymanski-d2DlULPkwbNWk0Htik3J/w@public.gmane.org\0"
+ "From\0Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0"
+ "Subject\0Re: [PATCH 1/1] ARM: dts: add Armadeus Systems OPOS6UL AND OPOS6ULDEV support\0"
  "Date\0Tue, 10 Jan 2017 14:49:36 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0S\303\251bastien Szymanski <sebastien.szymanski-d2DlULPkwbNWk0Htik3J/w@public.gmane.org>\0"
+ "Cc\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org"
+  Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>
+  devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+  Russell King <linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>
+  linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+  Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
+  Sascha Hauer <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
+  Fabio Estevam <fabio.estevam-3arQi8VN3Tc@public.gmane.org>
+ " Julien Boibessot <julien.boibessot-d2DlULPkwbNWk0Htik3J/w@public.gmane.org>\0"
  "\00:1\0"
  "b\0"
- "On Mon, Jan 09, 2017 at 05:00:18PM +0100, S?bastien Szymanski wrote:\n"
+ "On Mon, Jan 09, 2017 at 05:00:18PM +0100, S\303\251bastien Szymanski wrote:\n"
  "> OPOS6UL is an i.MX6UL based SoM.\n"
  "> OPOS6ULDev is a carrier board for the OPOS6UL SoM.\n"
  "> \n"
@@ -13,7 +23,7 @@
  "> http://www.opossom.com/english/products-processor_boards-opos6ul.html\n"
  "> http://www.opossom.com/english/products-development_boards-opos6ul_dev.html\n"
  "> \n"
- "> Signed-off-by: S?bastien Szymanski <sebastien.szymanski@armadeus.com>\n"
+ "> Signed-off-by: S\303\251bastien Szymanski <sebastien.szymanski-d2DlULPkwbNWk0Htik3J/w@public.gmane.org>\n"
  "\n"
  "s/AND/and in patch subject.\n"
  "\n"
@@ -44,7 +54,7 @@
  "> +++ b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi\n"
  "> @@ -0,0 +1,192 @@\n"
  "> +/*\n"
- "> + * Copyright 2016 Armadeus Systems <support@armadeus.com>\n"
+ "> + * Copyright 2016 Armadeus Systems <support-d2DlULPkwbNWk0Htik3J/w@public.gmane.org>\n"
  "> + *\n"
  "> + * This file is dual-licensed: you can use it either under the terms\n"
  "> + * of the GPL or the X11 license, at your option. Note that this dual\n"
@@ -124,7 +134,7 @@
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\n"
- "> +\t\tethphy1: ethernet-phy at 1 {\n"
+ "> +\t\tethphy1: ethernet-phy@1 {\n"
  "> +\t\t\tcompatible = \"ethernet-phy-ieee802.3-c22\";\n"
  "> +\t\t\treg = <1>;\n"
  "> +\t\t\tinterrupt-parent = <&gpio4>;\n"
@@ -168,7 +178,7 @@
  "> +\t#address-cells = <1>;\n"
  "> +\t#size-cells = <0>;\n"
  "> +\n"
- "> +\tbrcmf: bcrmf at 1 {\n"
+ "> +\tbrcmf: bcrmf@1 {\n"
  "> +\t\tcompatible = \"brcm,bcm4329-fmac\";\n"
  "> +\t\treg = <1>;\n"
  "> +\t\tinterrupt-parent = <&gpio2>;\n"
@@ -245,7 +255,7 @@
  "> +++ b/arch/arm/boot/dts/imx6ul-opos6uldev.dts\n"
  "> @@ -0,0 +1,414 @@\n"
  "> +/*\n"
- "> + * Copyright 2016 Armadeus Systems <support@armadeus.com>\n"
+ "> + * Copyright 2016 Armadeus Systems <support-d2DlULPkwbNWk0Htik3J/w@public.gmane.org>\n"
  "> + *\n"
  "> + * This file is dual-licensed: you can use it either under the terms\n"
  "> + * of the GPL or the X11 license, at your option. Note that this dual\n"
@@ -423,13 +433,13 @@
  "> +\tcs-gpios = <&gpio4 9 GPIO_ACTIVE_LOW>, <&gpio4 3 GPIO_ACTIVE_LOW>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\tspidev0: spi at 0 {\n"
+ "> +\tspidev0: spi@0 {\n"
  "> +\t\tcompatible = \"spidev\";\n"
  "> +\t\treg = <0>;\n"
  "> +\t\tspi-max-frequency = <5000000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tspidev1: spi at 1 {\n"
+ "> +\tspidev1: spi@1 {\n"
  "> +\t\tcompatible = \"spidev\";\n"
  "> +\t\treg = <1>;\n"
  "> +\t\tspi-max-frequency = <5000000>;\n"
@@ -698,7 +708,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
 
-2570b8d9b10c9aa88c95d100064ab56c541104993ca33661d275128aef3f0c8a
+f093fc293a8d7ef6e3a34e4b543233edc233ba7345ac38a49beddc321dd548bb
