diff for duplicates of <20160219032830.GG6756@tiger>

diff --git a/a/1.txt b/N1/1.txt
index dd8c338..8d40a13 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,5 +1,5 @@
 On Thu, Dec 24, 2015 at 05:11:38PM +0800, Zhiqiang Hou wrote:
-> From: Shaohui Xie <Shaohui.Xie@freescale.com>
+> From: Shaohui Xie <Shaohui.Xie-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
 > 
 
 Empty commit log is generally not welcomed.  You can have something here
@@ -8,9 +8,9 @@ to introduce the board briefly.
 We generally use lowercase for arm64 patch subject prefix, i.e.
 "arm64: dts: ...".  Yes, this is different from ARM.
 
-> Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
-> Signed-off-by: Mingkai Hu <Mingkai.Hu@freescale.com>
-> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@freescale.com>
+> Signed-off-by: Shaohui Xie <Shaohui.Xie-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
+> Signed-off-by: Mingkai Hu <Mingkai.Hu-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
+> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
 > ---
 > v2:
 >  - add root node compatible property
@@ -47,7 +47,7 @@ fsl-ls1043a-rdb.dtb is already wrong.
 > + *
 > + * Copyright 2014-2015, Freescale Semiconductor
 > + *
-> + * Mingkai Hu <Mingkai.hu@freescale.com>
+> + * Mingkai Hu <Mingkai.hu-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
 > + *
 > + * This file is dual-licensed: you can use it either under the terms
 > + * of the GPLv2 or the X11 license, at your option. Note that this dual
@@ -121,7 +121,7 @@ I suggest to sort all these aliases entries alphabetically.
 
 I suggest to have a new line between properties and sub-node.
 
-> +	pca9547 at 77 {
+> +	pca9547@77 {
 > +		compatible = "philips,pca9547";
 
 I cannot find this compatible string in either binding docs or driver
@@ -131,12 +131,12 @@ code.
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +
-> +		i2c at 0 {
+> +		i2c@0 {
 > +			#address-cells = <1>;
 > +			#size-cells = <0>;
 > +			reg = <0x0>;
 > +
-> +			rtc at 68 {
+> +			rtc@68 {
 > +				compatible = "dallas,ds3232";
 > +				reg = <0x68>;
 > +				/* IRQ10_B */
@@ -144,30 +144,30 @@ code.
 > +			};
 > +		};
 > +
-> +		i2c at 2 {
+> +		i2c@2 {
 > +			#address-cells = <1>;
 > +			#size-cells = <0>;
 > +			reg = <0x2>;
 > +
-> +			ina220 at 40 {
+> +			ina220@40 {
 > +				compatible = "ti,ina220";
 > +				reg = <0x40>;
 > +				shunt-resistor = <1000>;
 > +			};
 > +
-> +			ina220 at 41 {
+> +			ina220@41 {
 > +				compatible = "ti,ina220";
 > +				reg = <0x41>;
 > +				shunt-resistor = <1000>;
 > +			};
 > +		};
 > +
-> +		i2c at 3 {
+> +		i2c@3 {
 > +			#address-cells = <1>;
 > +			#size-cells = <0>;
 > +			reg = <0x3>;
 > +
-> +			eeprom at 56 {
+> +			eeprom@56 {
 > +				compatible = "at24,24c512";
 
 Unsupported/undocumented compatible?
@@ -175,12 +175,12 @@ Unsupported/undocumented compatible?
 > +				reg = <0x56>;
 > +			};
 > +
-> +			eeprom at 57 {
+> +			eeprom@57 {
 > +				compatible = "at24,24c512";
 > +				reg = <0x57>;
 > +			};
 > +
-> +			adt7461a at 4c {
+> +			adt7461a@4c {
 
 temp-sensor should be a better node name, if I understand the device
 correctly.
@@ -208,19 +208,19 @@ We generally put it at the bottom of the property list.
 > +		  0x1 0x0 0x0 0x7e800000 0x00010000
 > +		  0x2 0x0 0x0 0x7fb00000 0x00000100>;
 > +
-> +	nor at 0,0 {
+> +	nor@0,0 {
 > +		compatible = "cfi-flash";
 > +		reg = <0x0 0x0 0x8000000>;
 > +		bank-width = <2>;
 > +		device-width = <1>;
 > +	};
 > +
-> +	nand at 1,0 {
+> +	nand@1,0 {
 > +		compatible = "fsl,ifc-nand";
 > +		reg = <0x1 0x0 0x10000>;
 > +	};
 > +
-> +	fpga: board-control at 2,0 {
+> +	fpga: board-control@2,0 {
 > +		compatible = "fsl,ls1043aqds-fpga", "fsl,fpga-qixis";
 > +		reg = <0x2 0x0 0x0000100>;
 > +	};
@@ -248,6 +248,10 @@ 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 e90c573..4c488ee 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,13 +1,26 @@
  "ref\01450948298-33238-1-git-send-email-Zhiqiang.Hou@freescale.com\0"
  "ref\01450948298-33238-2-git-send-email-Zhiqiang.Hou@freescale.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH v2 2/2] ARM64: dts: add LS1043a-QDS board support\0"
+ "ref\01450948298-33238-2-git-send-email-Zhiqiang.Hou-KZfg59tc24xl57MIdRCFDg@public.gmane.org\0"
+ "From\0Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0"
+ "Subject\0Re: [PATCH v2 2/2] ARM64: dts: add LS1043a-QDS board support\0"
  "Date\0Fri, 19 Feb 2016 11:28:30 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Zhiqiang Hou <Zhiqiang.Hou-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\0"
+ "Cc\0devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
+  robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
+  mark.rutland-5wv7dgnIgG8@public.gmane.org
+  pawel.moll-5wv7dgnIgG8@public.gmane.org
+  ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org
+  galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
+  linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
+  catalin.marinas-5wv7dgnIgG8@public.gmane.org
+  will.deacon-5wv7dgnIgG8@public.gmane.org
+  scottwood-KZfg59tc24xl57MIdRCFDg@public.gmane.org
+  Mingkai.Hu-KZfg59tc24xl57MIdRCFDg@public.gmane.org
+ " Shaohui.Xie-KZfg59tc24xl57MIdRCFDg@public.gmane.org\0"
  "\00:1\0"
  "b\0"
  "On Thu, Dec 24, 2015 at 05:11:38PM +0800, Zhiqiang Hou wrote:\n"
- "> From: Shaohui Xie <Shaohui.Xie@freescale.com>\n"
+ "> From: Shaohui Xie <Shaohui.Xie-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\n"
  "> \n"
  "\n"
  "Empty commit log is generally not welcomed.  You can have something here\n"
@@ -16,9 +29,9 @@
  "We generally use lowercase for arm64 patch subject prefix, i.e.\n"
  "\"arm64: dts: ...\".  Yes, this is different from ARM.\n"
  "\n"
- "> Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>\n"
- "> Signed-off-by: Mingkai Hu <Mingkai.Hu@freescale.com>\n"
- "> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@freescale.com>\n"
+ "> Signed-off-by: Shaohui Xie <Shaohui.Xie-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\n"
+ "> Signed-off-by: Mingkai Hu <Mingkai.Hu-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\n"
+ "> Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\n"
  "> ---\n"
  "> v2:\n"
  ">  - add root node compatible property\n"
@@ -55,7 +68,7 @@
  "> + *\n"
  "> + * Copyright 2014-2015, Freescale Semiconductor\n"
  "> + *\n"
- "> + * Mingkai Hu <Mingkai.hu@freescale.com>\n"
+ "> + * Mingkai Hu <Mingkai.hu-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\n"
  "> + *\n"
  "> + * This file is dual-licensed: you can use it either under the terms\n"
  "> + * of the GPLv2 or the X11 license, at your option. Note that this dual\n"
@@ -129,7 +142,7 @@
  "\n"
  "I suggest to have a new line between properties and sub-node.\n"
  "\n"
- "> +\tpca9547 at 77 {\n"
+ "> +\tpca9547@77 {\n"
  "> +\t\tcompatible = \"philips,pca9547\";\n"
  "\n"
  "I cannot find this compatible string in either binding docs or driver\n"
@@ -139,12 +152,12 @@
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\n"
- "> +\t\ti2c at 0 {\n"
+ "> +\t\ti2c@0 {\n"
  "> +\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t#size-cells = <0>;\n"
  "> +\t\t\treg = <0x0>;\n"
  "> +\n"
- "> +\t\t\trtc at 68 {\n"
+ "> +\t\t\trtc@68 {\n"
  "> +\t\t\t\tcompatible = \"dallas,ds3232\";\n"
  "> +\t\t\t\treg = <0x68>;\n"
  "> +\t\t\t\t/* IRQ10_B */\n"
@@ -152,30 +165,30 @@
  "> +\t\t\t};\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\ti2c at 2 {\n"
+ "> +\t\ti2c@2 {\n"
  "> +\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t#size-cells = <0>;\n"
  "> +\t\t\treg = <0x2>;\n"
  "> +\n"
- "> +\t\t\tina220 at 40 {\n"
+ "> +\t\t\tina220@40 {\n"
  "> +\t\t\t\tcompatible = \"ti,ina220\";\n"
  "> +\t\t\t\treg = <0x40>;\n"
  "> +\t\t\t\tshunt-resistor = <1000>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tina220 at 41 {\n"
+ "> +\t\t\tina220@41 {\n"
  "> +\t\t\t\tcompatible = \"ti,ina220\";\n"
  "> +\t\t\t\treg = <0x41>;\n"
  "> +\t\t\t\tshunt-resistor = <1000>;\n"
  "> +\t\t\t};\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\ti2c at 3 {\n"
+ "> +\t\ti2c@3 {\n"
  "> +\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t#size-cells = <0>;\n"
  "> +\t\t\treg = <0x3>;\n"
  "> +\n"
- "> +\t\t\teeprom at 56 {\n"
+ "> +\t\t\teeprom@56 {\n"
  "> +\t\t\t\tcompatible = \"at24,24c512\";\n"
  "\n"
  "Unsupported/undocumented compatible?\n"
@@ -183,12 +196,12 @@
  "> +\t\t\t\treg = <0x56>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\teeprom at 57 {\n"
+ "> +\t\t\teeprom@57 {\n"
  "> +\t\t\t\tcompatible = \"at24,24c512\";\n"
  "> +\t\t\t\treg = <0x57>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tadt7461a at 4c {\n"
+ "> +\t\t\tadt7461a@4c {\n"
  "\n"
  "temp-sensor should be a better node name, if I understand the device\n"
  "correctly.\n"
@@ -216,19 +229,19 @@
  "> +\t\t  0x1 0x0 0x0 0x7e800000 0x00010000\n"
  "> +\t\t  0x2 0x0 0x0 0x7fb00000 0x00000100>;\n"
  "> +\n"
- "> +\tnor at 0,0 {\n"
+ "> +\tnor@0,0 {\n"
  "> +\t\tcompatible = \"cfi-flash\";\n"
  "> +\t\treg = <0x0 0x0 0x8000000>;\n"
  "> +\t\tbank-width = <2>;\n"
  "> +\t\tdevice-width = <1>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tnand at 1,0 {\n"
+ "> +\tnand@1,0 {\n"
  "> +\t\tcompatible = \"fsl,ifc-nand\";\n"
  "> +\t\treg = <0x1 0x0 0x10000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tfpga: board-control at 2,0 {\n"
+ "> +\tfpga: board-control@2,0 {\n"
  "> +\t\tcompatible = \"fsl,ls1043aqds-fpga\", \"fsl,fpga-qixis\";\n"
  "> +\t\treg = <0x2 0x0 0x0000100>;\n"
  "> +\t};\n"
@@ -256,8 +269,12 @@
  "> \n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel at lists.infradead.org\n"
+ "> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\n"
  "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
- >
+ "> \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
 
-a5b38c06e04bf441c86746e7cbfd461613b5b76eb4607357f86388a1369e1a9b
+83cef704a0b1f065da656ad67a5a44e9dffcc34b2b0cdd9f3e6f3eceaa3439f6
