diff for duplicates of <20170505023237.GV18578@dragon>

diff --git a/a/1.txt b/N1/1.txt
index 44362ad..89dac2b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,7 +4,7 @@ On Thu, May 04, 2017 at 02:40:32PM +0530, Prabhakar Kushwaha wrote:
 > 
 > So add flash information in ifc node of device tree.
 > 
-> Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
+> Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha-3arQi8VN3Tc@public.gmane.org>
 
 Please fix the subject prefix.
 
@@ -38,19 +38,19 @@ The ifc node defined in fsl-ls1088a.dtsi already has them, right?
 > +		  2 0 0x5 0x30000000 0x00010000
 > +		  3 0 0x5 0x20000000 0x00010000>;
 > +
-> +	nor at 0,0 {
+> +	nor@0,0 {
 > +		compatible = "cfi-flash";
 > +		reg = <0x0 0x0 0x8000000>;
 > +		bank-width = <2>;
 > +		device-width = <1>;
 > +	};
 > +
-> +	nand at 2,0 {
+> +	nand@2,0 {
 > +		compatible = "fsl,ifc-nand";
 > +		reg = <0x2 0x0 0x10000>;
 > +	};
 > +
-> +	fpga: board-control at 3,0 {
+> +	fpga: board-control@3,0 {
 > +		compatible = "fsl,ls1088aqds-fpga", "fsl,fpga-qixis";
 > +		reg = <0x3 0x0 0x0000100>;
 > +	};
@@ -75,12 +75,12 @@ The ifc node defined in fsl-ls1088a.dtsi already has them, right?
 > +	ranges = <0 0 0x5 0x30000000 0x00010000
 > +		  2 0 0x5 0x20000000 0x00010000>;
 > +
-> +	nand at 0,0 {
+> +	nand@0,0 {
 > +		compatible = "fsl,ifc-nand";
 > +		reg = <0x0 0x0 0x10000>;
 > +	};
 > +
-> +	fpga: board-control at 2,0 {
+> +	fpga: board-control@2,0 {
 > +		compatible = "fsl,ls1088ardb-fpga", "fsl,fpga-qixis";
 > +		reg = <0x2 0x0 0x0000100>;
 > +	};
@@ -109,7 +109,7 @@ Shawn
 > -			status = "disabled";
 >  		};
 >  
->  		i2c0: i2c at 2000000 {
+>  		i2c0: i2c@2000000 {
 > -- 
 > 2.7.4
 > 
@@ -117,5 +117,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 6a276d9..35c9f85 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,14 @@
  "ref\01493889032-20857-1-git-send-email-prabhakar.kushwaha@nxp.com\0"
  "ref\01493889032-20857-2-git-send-email-prabhakar.kushwaha@nxp.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH] arm: arm64: Add flash node for ls1088a qds and rdb\0"
+ "ref\01493889032-20857-2-git-send-email-prabhakar.kushwaha-3arQi8VN3Tc@public.gmane.org\0"
+ "From\0Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0"
+ "Subject\0Re: [PATCH] arm: arm64: Add flash node for ls1088a qds and rdb\0"
  "Date\0Fri, 5 May 2017 10:32:43 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Prabhakar Kushwaha <prabhakar.kushwaha-3arQi8VN3Tc@public.gmane.org>\0"
+ "Cc\0devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
+  robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
+  mark.rutland-5wv7dgnIgG8@public.gmane.org
+ " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0"
  "\00:1\0"
  "b\0"
  "On Thu, May 04, 2017 at 02:40:32PM +0530, Prabhakar Kushwaha wrote:\n"
@@ -12,7 +17,7 @@
  "> \n"
  "> So add flash information in ifc node of device tree.\n"
  "> \n"
- "> Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>\n"
+ "> Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha-3arQi8VN3Tc@public.gmane.org>\n"
  "\n"
  "Please fix the subject prefix.\n"
  "\n"
@@ -46,19 +51,19 @@
  "> +\t\t  2 0 0x5 0x30000000 0x00010000\n"
  "> +\t\t  3 0 0x5 0x20000000 0x00010000>;\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 2,0 {\n"
+ "> +\tnand@2,0 {\n"
  "> +\t\tcompatible = \"fsl,ifc-nand\";\n"
  "> +\t\treg = <0x2 0x0 0x10000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tfpga: board-control at 3,0 {\n"
+ "> +\tfpga: board-control@3,0 {\n"
  "> +\t\tcompatible = \"fsl,ls1088aqds-fpga\", \"fsl,fpga-qixis\";\n"
  "> +\t\treg = <0x3 0x0 0x0000100>;\n"
  "> +\t};\n"
@@ -83,12 +88,12 @@
  "> +\tranges = <0 0 0x5 0x30000000 0x00010000\n"
  "> +\t\t  2 0 0x5 0x20000000 0x00010000>;\n"
  "> +\n"
- "> +\tnand at 0,0 {\n"
+ "> +\tnand@0,0 {\n"
  "> +\t\tcompatible = \"fsl,ifc-nand\";\n"
  "> +\t\treg = <0x0 0x0 0x10000>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tfpga: board-control at 2,0 {\n"
+ "> +\tfpga: board-control@2,0 {\n"
  "> +\t\tcompatible = \"fsl,ls1088ardb-fpga\", \"fsl,fpga-qixis\";\n"
  "> +\t\treg = <0x2 0x0 0x0000100>;\n"
  "> +\t};\n"
@@ -117,7 +122,7 @@
  "> -\t\t\tstatus = \"disabled\";\n"
  ">  \t\t};\n"
  ">  \n"
- ">  \t\ti2c0: i2c at 2000000 {\n"
+ ">  \t\ti2c0: i2c@2000000 {\n"
  "> -- \n"
  "> 2.7.4\n"
  "> \n"
@@ -125,7 +130,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
 
-8e8aa38fb4133a0208f5ec8aac858ac1c46018dff3eccbe491884669745bf67f
+582b0d2f77694092db3b97f3c7e8b85c5bda6060bcf067b467e1be3eb9414c5c
