diff for duplicates of <20170313110223.GB3618@dragon>

diff --git a/a/1.txt b/N1/1.txt
index cc3c126..0bb934a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,7 +2,7 @@ On Sun, Feb 19, 2017 at 10:28:00PM +0200, Priit Laes wrote:
 > SMARC-sAMX6i is a SMARC (Smart Mobility Architecture) compliant
 > module.
 > 
-> Signed-off-by: Priit Laes <plaes@plaes.org>
+> Signed-off-by: Priit Laes <plaes-q/aMd4JkU83YtjvyW6yDsg@public.gmane.org>
 
 For sake of consistency, we use 'ARM: ...' instead of 'arm: ...' in
 subject prefix for all i.MX patches.
@@ -19,9 +19,9 @@ subject prefix for all i.MX patches.
 > +++ b/arch/arm/boot/dts/imx6q-smarc-sam6xi.dtsi
 > @@ -0,0 +1,434 @@
 > +/*
-> + * Copyright 2017 Priit Laes <plaes@plaes.org>
+> + * Copyright 2017 Priit Laes <plaes-q/aMd4JkU83YtjvyW6yDsg@public.gmane.org>
 > + *
-> + * Based on initial work by Nikita Yushchenko <nyushchenko@dev.rtsoft.ru>
+> + * Based on initial work by Nikita Yushchenko <nyushchenko at dev.rtsoft.ru>
 > + *
 > + * 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
@@ -88,7 +88,7 @@ following scheme:
 	};
 
 > +
-> +		reg_3v3_s5: regulator at 0 {
+> +		reg_3v3_s5: regulator@0 {
 > +			compatible = "regulator-fixed";
 > +			reg = <0>;
 > +			regulator-name = "V_3V3_S5";
@@ -98,7 +98,7 @@ following scheme:
 > +			regulator-always-on;
 > +		};
 > +
-> +		reg_1v8_s5: regulator at 1 {
+> +		reg_1v8_s5: regulator@1 {
 > +			compatible = "regulator-fixed";
 > +			reg = <1>;
 > +			regulator-name = "V_1V8_S5";
@@ -108,7 +108,7 @@ following scheme:
 > +			regulator-always-on;
 > +		};
 > +
-> +		reg_3v3_s0: regulator at 2 {
+> +		reg_3v3_s0: regulator@2 {
 > +			compatible = "regulator-fixed";
 > +			reg = <2>;
 > +			regulator-name = "V_3V3_S0";
@@ -118,7 +118,7 @@ following scheme:
 > +			regulator-always-on;
 > +		};
 > +
-> +		reg_1v0_s0: regulator at 3 {
+> +		reg_1v0_s0: regulator@3 {
 > +			compatible = "regulator-fixed";
 > +			reg = <3>;
 > +			regulator-name = "V_1V0_S0";
@@ -169,7 +169,7 @@ comments.
 > +};
 > +
 > +&i2c_pfuze {
-> +	pfuze100 at 08 {
+> +	pfuze100@08 {
 > +		compatible = "fsl,pfuze100";
 > +		reg = <0x08>;
 > +
@@ -501,5 +501,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 026cf20..feffbb3 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,16 +1,27 @@
  "ref\020170219202801.2082-1-plaes@plaes.org\0"
  "ref\020170219202801.2082-4-plaes@plaes.org\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH 3/4] arm: dts: imx: Add iMX6Q-based Kontron SMARC-sAMX6i module\0"
+ "ref\020170219202801.2082-4-plaes-q/aMd4JkU83YtjvyW6yDsg@public.gmane.org\0"
+ "From\0Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0"
+ "Subject\0Re: [PATCH 3/4] arm: dts: imx: Add iMX6Q-based Kontron SMARC-sAMX6i module\0"
  "Date\0Mon, 13 Mar 2017 19:02:26 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Priit Laes <plaes-q/aMd4JkU83YtjvyW6yDsg@public.gmane.org>\0"
+ "Cc\0Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>"
+  Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>
+  Russell King <linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>
+  Sascha Hauer <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
+  Fabio Estevam <fabio.estevam-3arQi8VN3Tc@public.gmane.org>
+  Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
+  Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>
+  devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+  linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+ " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0"
  "\00:1\0"
  "b\0"
  "On Sun, Feb 19, 2017 at 10:28:00PM +0200, Priit Laes wrote:\n"
  "> SMARC-sAMX6i is a SMARC (Smart Mobility Architecture) compliant\n"
  "> module.\n"
  "> \n"
- "> Signed-off-by: Priit Laes <plaes@plaes.org>\n"
+ "> Signed-off-by: Priit Laes <plaes-q/aMd4JkU83YtjvyW6yDsg@public.gmane.org>\n"
  "\n"
  "For sake of consistency, we use 'ARM: ...' instead of 'arm: ...' in\n"
  "subject prefix for all i.MX patches.\n"
@@ -27,9 +38,9 @@
  "> +++ b/arch/arm/boot/dts/imx6q-smarc-sam6xi.dtsi\n"
  "> @@ -0,0 +1,434 @@\n"
  "> +/*\n"
- "> + * Copyright 2017 Priit Laes <plaes@plaes.org>\n"
+ "> + * Copyright 2017 Priit Laes <plaes-q/aMd4JkU83YtjvyW6yDsg@public.gmane.org>\n"
  "> + *\n"
- "> + * Based on initial work by Nikita Yushchenko <nyushchenko@dev.rtsoft.ru>\n"
+ "> + * Based on initial work by Nikita Yushchenko <nyushchenko at dev.rtsoft.ru>\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"
@@ -96,7 +107,7 @@
  "\t};\n"
  "\n"
  "> +\n"
- "> +\t\treg_3v3_s5: regulator at 0 {\n"
+ "> +\t\treg_3v3_s5: regulator@0 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <0>;\n"
  "> +\t\t\tregulator-name = \"V_3V3_S5\";\n"
@@ -106,7 +117,7 @@
  "> +\t\t\tregulator-always-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\treg_1v8_s5: regulator at 1 {\n"
+ "> +\t\treg_1v8_s5: regulator@1 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <1>;\n"
  "> +\t\t\tregulator-name = \"V_1V8_S5\";\n"
@@ -116,7 +127,7 @@
  "> +\t\t\tregulator-always-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\treg_3v3_s0: regulator at 2 {\n"
+ "> +\t\treg_3v3_s0: regulator@2 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <2>;\n"
  "> +\t\t\tregulator-name = \"V_3V3_S0\";\n"
@@ -126,7 +137,7 @@
  "> +\t\t\tregulator-always-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\treg_1v0_s0: regulator at 3 {\n"
+ "> +\t\treg_1v0_s0: regulator@3 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <3>;\n"
  "> +\t\t\tregulator-name = \"V_1V0_S0\";\n"
@@ -177,7 +188,7 @@
  "> +};\n"
  "> +\n"
  "> +&i2c_pfuze {\n"
- "> +\tpfuze100 at 08 {\n"
+ "> +\tpfuze100@08 {\n"
  "> +\t\tcompatible = \"fsl,pfuze100\";\n"
  "> +\t\treg = <0x08>;\n"
  "> +\n"
@@ -509,7 +520,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
 
-98660a759eea0f5063befa1b78d1a0df26ba6dbe06f88424de0f3f76ddc232ee
+6046429e160e2595650a835170115b4a3b005b11ad26b855af145cea87c7ed44
