diff for duplicates of <20161230022527.GH6177@dragon>

diff --git a/a/1.txt b/N1/1.txt
index 2234b31..c63777e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,7 +1,7 @@
 On Thu, Nov 17, 2016 at 09:08:19AM +0800, Bai Ping wrote:
 > Add ocotp node for i.MX6UL SOC.
 > 
-> Signed-off-by: Bai Ping <ping.bai@nxp.com>
+> Signed-off-by: Bai Ping <ping.bai-3arQi8VN3Tc@public.gmane.org>
 
 The DTS change looks good to me.  But I cannot apply it until the driver
 and bindings part get accepted.  You should figure out who is collecting
@@ -21,13 +21,13 @@ Shawn
 >  				reg = <0x021b0000 0x4000>;
 >  			};
 >  
-> +			ocotp: ocotp-ctrl at 021bc000 {
+> +			ocotp: ocotp-ctrl@021bc000 {
 > +				compatible = "fsl,imx6ul-ocotp", "syscon";
 > +				reg = <0x021bc000 0x4000>;
 > +				clocks = <&clks IMX6UL_CLK_OCOTP>;
 > +			};
 > +
->  			lcdif: lcdif at 021c8000 {
+>  			lcdif: lcdif@021c8000 {
 >  				compatible = "fsl,imx6ul-lcdif", "fsl,imx28-lcdif";
 >  				reg = <0x021c8000 0x4000>;
 > -- 
@@ -36,5 +36,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 538e043..e8f7d24 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,15 +1,24 @@
  "ref\01479344899-3141-1-git-send-email-ping.bai@nxp.com\0"
  "ref\01479344899-3141-3-git-send-email-ping.bai@nxp.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH v2 3/3] ARM: dts: imx: Add ocotp node for imx6ul\0"
+ "ref\01479344899-3141-3-git-send-email-ping.bai-3arQi8VN3Tc@public.gmane.org\0"
+ "From\0Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0"
+ "Subject\0Re: [PATCH v2 3/3] ARM: dts: imx: Add ocotp node for imx6ul\0"
  "Date\0Fri, 30 Dec 2016 10:25:29 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Bai Ping <ping.bai-3arQi8VN3Tc@public.gmane.org>\0"
+ "Cc\0robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org"
+  mark.rutland-5wv7dgnIgG8@public.gmane.org
+  devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+  srinivas.kandagatla-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org
+  kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org
+  fabio.estevam-3arQi8VN3Tc@public.gmane.org
+  maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org
+ " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0"
  "\00:1\0"
  "b\0"
  "On Thu, Nov 17, 2016 at 09:08:19AM +0800, Bai Ping wrote:\n"
  "> Add ocotp node for i.MX6UL SOC.\n"
  "> \n"
- "> Signed-off-by: Bai Ping <ping.bai@nxp.com>\n"
+ "> Signed-off-by: Bai Ping <ping.bai-3arQi8VN3Tc@public.gmane.org>\n"
  "\n"
  "The DTS change looks good to me.  But I cannot apply it until the driver\n"
  "and bindings part get accepted.  You should figure out who is collecting\n"
@@ -29,13 +38,13 @@
  ">  \t\t\t\treg = <0x021b0000 0x4000>;\n"
  ">  \t\t\t};\n"
  ">  \n"
- "> +\t\t\tocotp: ocotp-ctrl at 021bc000 {\n"
+ "> +\t\t\tocotp: ocotp-ctrl@021bc000 {\n"
  "> +\t\t\t\tcompatible = \"fsl,imx6ul-ocotp\", \"syscon\";\n"
  "> +\t\t\t\treg = <0x021bc000 0x4000>;\n"
  "> +\t\t\t\tclocks = <&clks IMX6UL_CLK_OCOTP>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- ">  \t\t\tlcdif: lcdif at 021c8000 {\n"
+ ">  \t\t\tlcdif: lcdif@021c8000 {\n"
  ">  \t\t\t\tcompatible = \"fsl,imx6ul-lcdif\", \"fsl,imx28-lcdif\";\n"
  ">  \t\t\t\treg = <0x021c8000 0x4000>;\n"
  "> -- \n"
@@ -44,7 +53,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
 
-3d86f1202501ddea88582dcd66ba464e38ae12c9024450ce499a78e5ca6e101a
+9544cf76a4fe425d89a4c32695c4329c9e63ae03dc3555335a2ded545e069bff
