diff for duplicates of <20160412024947.GD15949@tiger>

diff --git a/a/1.txt b/N1/1.txt
index b134621..89b830b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,7 +1,7 @@
 On Thu, Mar 31, 2016 at 02:45:01PM +0800, Yuan Yao wrote:
-> From: Yuan Yao <yao.yuan@nxp.com>
+> From: Yuan Yao <yao.yuan-3arQi8VN3Tc@public.gmane.org>
 > 
-> Signed-off-by: Yuan Yao <yao.yuan@nxp.com>
+> Signed-off-by: Yuan Yao <yao.yuan-3arQi8VN3Tc@public.gmane.org>
 
 Please style of 'arm64: dts: ls1043a: ' for subject prefix.
 
@@ -37,7 +37,7 @@ Please let 'status' line be the last of property list.
 I do not see this one in bindings definition either.
 
 > +
-> +	qflash0: s25fl128s at 0 {
+> +	qflash0: s25fl128s@0 {
 > +		compatible = "spansion,m25p80";
 > +		#address-cells = <1>;
 > +		#size-cells = <1>;
@@ -52,7 +52,7 @@ Ditto
 > +
 >  &i2c0 {
 >  	status = "okay";
->  	pca9547 at 77 {
+>  	pca9547@77 {
 > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
 > index be72bf5..49b1aeb 100644
 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
@@ -61,10 +61,10 @@ Ditto
 >  			status = "disabled";
 >  		};
 >  
-> +		qspi: quadspi at 1550000 {
+> +		qspi: quadspi@1550000 {
 
 Please sort the node in <soc>.dtsi in order of unit-address.  That said,
-the node should be added between ifc at 1530000 and esdhc at 1560000.
+the node should be added between ifc@1530000 and esdhc@1560000.
 
 Shawn
 
@@ -81,7 +81,7 @@ Shawn
 > +			status = "disabled";
 > +		};
 > +
->  		i2c0: i2c at 2180000 {
+>  		i2c0: i2c@2180000 {
 >  			compatible = "fsl,vf610-i2c";
 >  			#address-cells = <1>;
 > -- 
@@ -90,6 +90,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 d5acec8..0e26dde 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,15 +1,26 @@
  "ref\01459406701-40993-1-git-send-email-yao.yuan@freescale.com\0"
  "ref\01459406701-40993-3-git-send-email-yao.yuan@freescale.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH 2/2] dts/ls1043a: add the DTS node for QSPI support\0"
+ "ref\01459406701-40993-3-git-send-email-yao.yuan-KZfg59tc24xl57MIdRCFDg@public.gmane.org\0"
+ "From\0Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0"
+ "Subject\0Re: [PATCH 2/2] dts/ls1043a: add the DTS node for QSPI support\0"
  "Date\0Tue, 12 Apr 2016 10:49:47 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Yuan Yao <yao.yuan-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\0"
+ "Cc\0robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org"
+  mark.rutland-5wv7dgnIgG8@public.gmane.org
+  computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
+  pawel.moll-5wv7dgnIgG8@public.gmane.org
+  han.xu-3arQi8VN3Tc@public.gmane.org
+  leoyang.li-3arQi8VN3Tc@public.gmane.org
+  devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+  linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+  linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
+ " Yuan Yao <yao.yuan-3arQi8VN3Tc@public.gmane.org>\0"
  "\00:1\0"
  "b\0"
  "On Thu, Mar 31, 2016 at 02:45:01PM +0800, Yuan Yao wrote:\n"
- "> From: Yuan Yao <yao.yuan@nxp.com>\n"
+ "> From: Yuan Yao <yao.yuan-3arQi8VN3Tc@public.gmane.org>\n"
  "> \n"
- "> Signed-off-by: Yuan Yao <yao.yuan@nxp.com>\n"
+ "> Signed-off-by: Yuan Yao <yao.yuan-3arQi8VN3Tc@public.gmane.org>\n"
  "\n"
  "Please style of 'arm64: dts: ls1043a: ' for subject prefix.\n"
  "\n"
@@ -45,7 +56,7 @@
  "I do not see this one in bindings definition either.\n"
  "\n"
  "> +\n"
- "> +\tqflash0: s25fl128s at 0 {\n"
+ "> +\tqflash0: s25fl128s@0 {\n"
  "> +\t\tcompatible = \"spansion,m25p80\";\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <1>;\n"
@@ -60,7 +71,7 @@
  "> +\n"
  ">  &i2c0 {\n"
  ">  \tstatus = \"okay\";\n"
- ">  \tpca9547 at 77 {\n"
+ ">  \tpca9547@77 {\n"
  "> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi\n"
  "> index be72bf5..49b1aeb 100644\n"
  "> --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi\n"
@@ -69,10 +80,10 @@
  ">  \t\t\tstatus = \"disabled\";\n"
  ">  \t\t};\n"
  ">  \n"
- "> +\t\tqspi: quadspi at 1550000 {\n"
+ "> +\t\tqspi: quadspi@1550000 {\n"
  "\n"
  "Please sort the node in <soc>.dtsi in order of unit-address.  That said,\n"
- "the node should be added between ifc at 1530000 and esdhc at 1560000.\n"
+ "the node should be added between ifc@1530000 and esdhc@1560000.\n"
  "\n"
  "Shawn\n"
  "\n"
@@ -89,7 +100,7 @@
  "> +\t\t\tstatus = \"disabled\";\n"
  "> +\t\t};\n"
  "> +\n"
- ">  \t\ti2c0: i2c at 2180000 {\n"
+ ">  \t\ti2c0: i2c@2180000 {\n"
  ">  \t\t\tcompatible = \"fsl,vf610-i2c\";\n"
  ">  \t\t\t#address-cells = <1>;\n"
  "> -- \n"
@@ -98,8 +109,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
 
-16ee8ef27150434a048e4f34d69097eabb7d6693ae7176e956aba07976632733
+02ab166dbeb79d9c47d8e43410f5f32acfa11e5ec6fece49e8aa45551f8abfc7
