diff for duplicates of <20160413022939.GE28903@tiger>

diff --git a/a/1.txt b/N1/1.txt
index 6eb121e..1ff2076 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,6 +1,6 @@
 On Wed, Mar 09, 2016 at 06:22:06PM +0800, Yuan Yao wrote:
-> Signed-off-by: Yuan Yao <yao.yuan@nxp.com>
-> Acked-by: Han xu <han.xu@nxp.com>
+> Signed-off-by: Yuan Yao <yao.yuan-3arQi8VN3Tc@public.gmane.org>
+> Acked-by: Han xu <han.xu-3arQi8VN3Tc@public.gmane.org>
 
 Changed subject prefix to 'arm64: dts: ls2080a: ', and then applied the
 patch.
@@ -21,7 +21,7 @@ Shawn
 > No changes.
 > 
 > Changed in v2:
-> Update my email to <yao.yuan@nxp.com>
+> Update my email to <yao.yuan-3arQi8VN3Tc@public.gmane.org>
 > ---
 >  arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 9 ++++++++-
 >  arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi    | 4 ++--
@@ -36,14 +36,14 @@ Shawn
 >  &qspi {
 >  	status = "okay";
 > -	qflash0: s25fl008k {
-> +	flash0: s25fl256s1 at 0 {
+> +	flash0: s25fl256s1@0 {
 > +		#address-cells = <1>;
 > +		#size-cells = <1>;
 > +		compatible = "st,m25p80";
 > +		spi-max-frequency = <20000000>;
 > +		reg = <0>;
 > +	};
-> +	flash2: s25fl256s1 at 2 {
+> +	flash2: s25fl256s1@2 {
 >  		#address-cells = <1>;
 >  		#size-cells = <1>;
 >  		compatible = "st,m25p80";
@@ -53,7 +53,7 @@ Shawn
 > +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
 > @@ -318,7 +318,7 @@
 >  
->  		dspi: dspi at 2100000 {
+>  		dspi: dspi@2100000 {
 >  			status = "disabled";
 > -			compatible = "fsl,vf610-dspi";
 > +			compatible = "fsl,ls2080a-dspi", "fsl,ls2085a-dspi";
@@ -62,7 +62,7 @@ Shawn
 >  			reg = <0x0 0x2100000 0x0 0x10000>;
 > @@ -444,7 +444,7 @@
 >  
->  		qspi: quadspi at 20c0000 {
+>  		qspi: quadspi@20c0000 {
 >  			status = "disabled";
 > -			compatible = "fsl,vf610-qspi";
 > +			compatible = "fsl,ls2080a-qspi", "fsl,ls1021a-qspi";
@@ -75,6 +75,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 4fef4bd..0e1e88b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,14 +1,24 @@
  "ref\01457518926-18518-1-git-send-email-yao.yuan@freescale.com\0"
  "ref\01457518926-18518-3-git-send-email-yao.yuan@freescale.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH v6 2/2] dts/ls2080a: update the DTS for QSPI and DSPI support\0"
+ "ref\01457518926-18518-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 v6 2/2] dts/ls2080a: update the DTS for QSPI and DSPI support\0"
  "Date\0Wed, 13 Apr 2016 10:29:40 +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
+  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 Wed, Mar 09, 2016 at 06:22:06PM +0800, Yuan Yao wrote:\n"
- "> Signed-off-by: Yuan Yao <yao.yuan@nxp.com>\n"
- "> Acked-by: Han xu <han.xu@nxp.com>\n"
+ "> Signed-off-by: Yuan Yao <yao.yuan-3arQi8VN3Tc@public.gmane.org>\n"
+ "> Acked-by: Han xu <han.xu-3arQi8VN3Tc@public.gmane.org>\n"
  "\n"
  "Changed subject prefix to 'arm64: dts: ls2080a: ', and then applied the\n"
  "patch.\n"
@@ -29,7 +39,7 @@
  "> No changes.\n"
  "> \n"
  "> Changed in v2:\n"
- "> Update my email to <yao.yuan@nxp.com>\n"
+ "> Update my email to <yao.yuan-3arQi8VN3Tc@public.gmane.org>\n"
  "> ---\n"
  ">  arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 9 ++++++++-\n"
  ">  arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi    | 4 ++--\n"
@@ -44,14 +54,14 @@
  ">  &qspi {\n"
  ">  \tstatus = \"okay\";\n"
  "> -\tqflash0: s25fl008k {\n"
- "> +\tflash0: s25fl256s1 at 0 {\n"
+ "> +\tflash0: s25fl256s1@0 {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <1>;\n"
  "> +\t\tcompatible = \"st,m25p80\";\n"
  "> +\t\tspi-max-frequency = <20000000>;\n"
  "> +\t\treg = <0>;\n"
  "> +\t};\n"
- "> +\tflash2: s25fl256s1 at 2 {\n"
+ "> +\tflash2: s25fl256s1@2 {\n"
  ">  \t\t#address-cells = <1>;\n"
  ">  \t\t#size-cells = <1>;\n"
  ">  \t\tcompatible = \"st,m25p80\";\n"
@@ -61,7 +71,7 @@
  "> +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi\n"
  "> @@ -318,7 +318,7 @@\n"
  ">  \n"
- ">  \t\tdspi: dspi at 2100000 {\n"
+ ">  \t\tdspi: dspi@2100000 {\n"
  ">  \t\t\tstatus = \"disabled\";\n"
  "> -\t\t\tcompatible = \"fsl,vf610-dspi\";\n"
  "> +\t\t\tcompatible = \"fsl,ls2080a-dspi\", \"fsl,ls2085a-dspi\";\n"
@@ -70,7 +80,7 @@
  ">  \t\t\treg = <0x0 0x2100000 0x0 0x10000>;\n"
  "> @@ -444,7 +444,7 @@\n"
  ">  \n"
- ">  \t\tqspi: quadspi at 20c0000 {\n"
+ ">  \t\tqspi: quadspi@20c0000 {\n"
  ">  \t\t\tstatus = \"disabled\";\n"
  "> -\t\t\tcompatible = \"fsl,vf610-qspi\";\n"
  "> +\t\t\tcompatible = \"fsl,ls2080a-qspi\", \"fsl,ls1021a-qspi\";\n"
@@ -83,8 +93,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
 
-652c94975a48a4e10146d32ba68f56b70e856bc499936ec6a2fc9bfbad55b6bf
+796cabfa6a3c9b6d3522637b06ef02a6c62d2348da8a2059dcca7b3d22d5681e
