diff for duplicates of <20160413055019.GK28903@tiger>

diff --git a/a/1.txt b/N1/1.txt
index c8f301a..3e4de2d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,12 +1,12 @@
 On Fri, Apr 01, 2016 at 03:54:40PM -0500, Stuart Yoder wrote:
-> From: Stuart Yoder <stuart.yoder@nxp.com>
+> From: Stuart Yoder <stuart.yoder-3arQi8VN3Tc@public.gmane.org>
 > 
 > updates to the fsl-mc node for full functionality:
 >    -msi-parent is needed for interrupt support
 >    -ranges is needed to enable the bus driver to translate bus addresses
 >    -dpmac nodes provide a basis for relating dpmac objects to PHYs
 > 
-> Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
+> Signed-off-by: Stuart Yoder <stuart.yoder-3arQi8VN3Tc@public.gmane.org>
 > ---
 >  arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi |   87 ++++++++++++++++++++++++
 >  1 file changed, 87 insertions(+)
@@ -40,7 +40,7 @@ On Fri, Apr 01, 2016 at 03:54:40PM -0500, Stuart Yoder wrote:
 > +				#address-cells = <1>;
 > +				#size-cells = <0>;
 > +
-> +				dpmac1: dpmac at 1 {
+> +				dpmac1: dpmac@1 {
 > +					compatible = "fsl,qoriq-mc-dpmac";
 
 I did not see how this compatible is used by kernel driver.
@@ -52,63 +52,63 @@ Please have a newline between nodes.
 
 Shawn
 
-> +				dpmac2: dpmac at 2 {
+> +				dpmac2: dpmac@2 {
 > +					compatible = "fsl,qoriq-mc-dpmac";
 > +					reg = <2>;
 > +				};
-> +				dpmac3: dpmac at 3 {
+> +				dpmac3: dpmac@3 {
 > +					compatible = "fsl,qoriq-mc-dpmac";
 > +					reg = <3>;
 > +				};
-> +				dpmac4: dpmac at 4 {
+> +				dpmac4: dpmac@4 {
 > +					compatible = "fsl,qoriq-mc-dpmac";
 > +					reg = <4>;
 > +				};
-> +				dpmac5: dpmac at 5 {
+> +				dpmac5: dpmac@5 {
 > +					compatible = "fsl,qoriq-mc-dpmac";
 > +					reg = <5>;
 > +				};
-> +				dpmac6: dpmac at 6 {
+> +				dpmac6: dpmac@6 {
 > +					compatible = "fsl,qoriq-mc-dpmac";
 > +					reg = <6>;
 > +				};
-> +				dpmac7: dpmac at 7 {
+> +				dpmac7: dpmac@7 {
 > +					compatible = "fsl,qoriq-mc-dpmac";
 > +					reg = <7>;
 > +				};
-> +				dpmac8: dpmac at 8 {
+> +				dpmac8: dpmac@8 {
 > +					compatible = "fsl,qoriq-mc-dpmac";
 > +					reg = <8>;
 > +				};
-> +				dpmac9: dpmac at 9 {
+> +				dpmac9: dpmac@9 {
 > +					compatible = "fsl,qoriq-mc-dpmac";
 > +					reg = <9>;
 > +				};
-> +				dpmac10: dpmac at 10 {
+> +				dpmac10: dpmac@10 {
 > +					compatible = "fsl,qoriq-mc-dpmac";
 > +					reg = <0xa>;
 > +				};
-> +				dpmac11: dpmac at 11 {
+> +				dpmac11: dpmac@11 {
 > +					compatible = "fsl,qoriq-mc-dpmac";
 > +					reg = <0xb>;
 > +				};
-> +				dpmac12: dpmac at 12 {
+> +				dpmac12: dpmac@12 {
 > +					compatible = "fsl,qoriq-mc-dpmac";
 > +					reg = <0xc>;
 > +				};
-> +				dpmac13: dpmac at 13 {
+> +				dpmac13: dpmac@13 {
 > +					compatible = "fsl,qoriq-mc-dpmac";
 > +					reg = <0xd>;
 > +				};
-> +				dpmac14: dpmac at 14 {
+> +				dpmac14: dpmac@14 {
 > +					compatible = "fsl,qoriq-mc-dpmac";
 > +					reg = <0xe>;
 > +				};
-> +				dpmac15: dpmac at 15 {
+> +				dpmac15: dpmac@15 {
 > +					compatible = "fsl,qoriq-mc-dpmac";
 > +					reg = <0xf>;
 > +				};
-> +				dpmac16: dpmac at 16 {
+> +				dpmac16: dpmac@16 {
 > +					compatible = "fsl,qoriq-mc-dpmac";
 > +					reg = <0x10>;
 > +				};
@@ -116,13 +116,17 @@ Shawn
 > +
 >  		};
 >  
->  		smmu: iommu at 5000000 {
+>  		smmu: iommu@5000000 {
 > -- 
 > 1.7.9.5
 > 
 > 
 > _______________________________________________
 > 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 ba8d87f..ce8ef03 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,19 +1,27 @@
  "ref\01459544080-28598-1-git-send-email-stuart.yoder@nxp.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH 2/2] arm64: dts: ls2080a: fsl-mc dt node updates\0"
+ "ref\01459544080-28598-1-git-send-email-stuart.yoder-3arQi8VN3Tc@public.gmane.org\0"
+ "From\0Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0"
+ "Subject\0Re: [PATCH 2/2] arm64: dts: ls2080a: fsl-mc dt node updates\0"
  "Date\0Wed, 13 Apr 2016 13:50:19 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Stuart Yoder <stuart.yoder-3arQi8VN3Tc@public.gmane.org>\0"
+ "Cc\0devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
+  linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
+  mark.rutland-5wv7dgnIgG8@public.gmane.org
+  german.rivera-KZfg59tc24xl57MIdRCFDg@public.gmane.org
+  linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+  robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
+ " leoyang.li-3arQi8VN3Tc@public.gmane.org\0"
  "\00:1\0"
  "b\0"
  "On Fri, Apr 01, 2016 at 03:54:40PM -0500, Stuart Yoder wrote:\n"
- "> From: Stuart Yoder <stuart.yoder@nxp.com>\n"
+ "> From: Stuart Yoder <stuart.yoder-3arQi8VN3Tc@public.gmane.org>\n"
  "> \n"
  "> updates to the fsl-mc node for full functionality:\n"
  ">    -msi-parent is needed for interrupt support\n"
  ">    -ranges is needed to enable the bus driver to translate bus addresses\n"
  ">    -dpmac nodes provide a basis for relating dpmac objects to PHYs\n"
  "> \n"
- "> Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>\n"
+ "> Signed-off-by: Stuart Yoder <stuart.yoder-3arQi8VN3Tc@public.gmane.org>\n"
  "> ---\n"
  ">  arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi |   87 ++++++++++++++++++++++++\n"
  ">  1 file changed, 87 insertions(+)\n"
@@ -47,7 +55,7 @@
  "> +\t\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t\t#size-cells = <0>;\n"
  "> +\n"
- "> +\t\t\t\tdpmac1: dpmac at 1 {\n"
+ "> +\t\t\t\tdpmac1: dpmac@1 {\n"
  "> +\t\t\t\t\tcompatible = \"fsl,qoriq-mc-dpmac\";\n"
  "\n"
  "I did not see how this compatible is used by kernel driver.\n"
@@ -59,63 +67,63 @@
  "\n"
  "Shawn\n"
  "\n"
- "> +\t\t\t\tdpmac2: dpmac at 2 {\n"
+ "> +\t\t\t\tdpmac2: dpmac@2 {\n"
  "> +\t\t\t\t\tcompatible = \"fsl,qoriq-mc-dpmac\";\n"
  "> +\t\t\t\t\treg = <2>;\n"
  "> +\t\t\t\t};\n"
- "> +\t\t\t\tdpmac3: dpmac at 3 {\n"
+ "> +\t\t\t\tdpmac3: dpmac@3 {\n"
  "> +\t\t\t\t\tcompatible = \"fsl,qoriq-mc-dpmac\";\n"
  "> +\t\t\t\t\treg = <3>;\n"
  "> +\t\t\t\t};\n"
- "> +\t\t\t\tdpmac4: dpmac at 4 {\n"
+ "> +\t\t\t\tdpmac4: dpmac@4 {\n"
  "> +\t\t\t\t\tcompatible = \"fsl,qoriq-mc-dpmac\";\n"
  "> +\t\t\t\t\treg = <4>;\n"
  "> +\t\t\t\t};\n"
- "> +\t\t\t\tdpmac5: dpmac at 5 {\n"
+ "> +\t\t\t\tdpmac5: dpmac@5 {\n"
  "> +\t\t\t\t\tcompatible = \"fsl,qoriq-mc-dpmac\";\n"
  "> +\t\t\t\t\treg = <5>;\n"
  "> +\t\t\t\t};\n"
- "> +\t\t\t\tdpmac6: dpmac at 6 {\n"
+ "> +\t\t\t\tdpmac6: dpmac@6 {\n"
  "> +\t\t\t\t\tcompatible = \"fsl,qoriq-mc-dpmac\";\n"
  "> +\t\t\t\t\treg = <6>;\n"
  "> +\t\t\t\t};\n"
- "> +\t\t\t\tdpmac7: dpmac at 7 {\n"
+ "> +\t\t\t\tdpmac7: dpmac@7 {\n"
  "> +\t\t\t\t\tcompatible = \"fsl,qoriq-mc-dpmac\";\n"
  "> +\t\t\t\t\treg = <7>;\n"
  "> +\t\t\t\t};\n"
- "> +\t\t\t\tdpmac8: dpmac at 8 {\n"
+ "> +\t\t\t\tdpmac8: dpmac@8 {\n"
  "> +\t\t\t\t\tcompatible = \"fsl,qoriq-mc-dpmac\";\n"
  "> +\t\t\t\t\treg = <8>;\n"
  "> +\t\t\t\t};\n"
- "> +\t\t\t\tdpmac9: dpmac at 9 {\n"
+ "> +\t\t\t\tdpmac9: dpmac@9 {\n"
  "> +\t\t\t\t\tcompatible = \"fsl,qoriq-mc-dpmac\";\n"
  "> +\t\t\t\t\treg = <9>;\n"
  "> +\t\t\t\t};\n"
- "> +\t\t\t\tdpmac10: dpmac at 10 {\n"
+ "> +\t\t\t\tdpmac10: dpmac@10 {\n"
  "> +\t\t\t\t\tcompatible = \"fsl,qoriq-mc-dpmac\";\n"
  "> +\t\t\t\t\treg = <0xa>;\n"
  "> +\t\t\t\t};\n"
- "> +\t\t\t\tdpmac11: dpmac at 11 {\n"
+ "> +\t\t\t\tdpmac11: dpmac@11 {\n"
  "> +\t\t\t\t\tcompatible = \"fsl,qoriq-mc-dpmac\";\n"
  "> +\t\t\t\t\treg = <0xb>;\n"
  "> +\t\t\t\t};\n"
- "> +\t\t\t\tdpmac12: dpmac at 12 {\n"
+ "> +\t\t\t\tdpmac12: dpmac@12 {\n"
  "> +\t\t\t\t\tcompatible = \"fsl,qoriq-mc-dpmac\";\n"
  "> +\t\t\t\t\treg = <0xc>;\n"
  "> +\t\t\t\t};\n"
- "> +\t\t\t\tdpmac13: dpmac at 13 {\n"
+ "> +\t\t\t\tdpmac13: dpmac@13 {\n"
  "> +\t\t\t\t\tcompatible = \"fsl,qoriq-mc-dpmac\";\n"
  "> +\t\t\t\t\treg = <0xd>;\n"
  "> +\t\t\t\t};\n"
- "> +\t\t\t\tdpmac14: dpmac at 14 {\n"
+ "> +\t\t\t\tdpmac14: dpmac@14 {\n"
  "> +\t\t\t\t\tcompatible = \"fsl,qoriq-mc-dpmac\";\n"
  "> +\t\t\t\t\treg = <0xe>;\n"
  "> +\t\t\t\t};\n"
- "> +\t\t\t\tdpmac15: dpmac at 15 {\n"
+ "> +\t\t\t\tdpmac15: dpmac@15 {\n"
  "> +\t\t\t\t\tcompatible = \"fsl,qoriq-mc-dpmac\";\n"
  "> +\t\t\t\t\treg = <0xf>;\n"
  "> +\t\t\t\t};\n"
- "> +\t\t\t\tdpmac16: dpmac at 16 {\n"
+ "> +\t\t\t\tdpmac16: dpmac@16 {\n"
  "> +\t\t\t\t\tcompatible = \"fsl,qoriq-mc-dpmac\";\n"
  "> +\t\t\t\t\treg = <0x10>;\n"
  "> +\t\t\t\t};\n"
@@ -123,15 +131,19 @@
  "> +\n"
  ">  \t\t};\n"
  ">  \n"
- ">  \t\tsmmu: iommu at 5000000 {\n"
+ ">  \t\tsmmu: iommu@5000000 {\n"
  "> -- \n"
  "> 1.7.9.5\n"
  "> \n"
  "> \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
 
-c0e1fffb6061707637a61d04ffa15c41837084ee59db7a25eb5420614f9ae9ad
+8edb6b042553047de93415cbc22de6b0d83a423146b7c94324096f54910522bc
