diff for duplicates of <20180428031231.GB3693@dragon>

diff --git a/a/1.txt b/N1/1.txt
index 008689c..c742c1f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,4 +1,4 @@
-On Fri, Apr 27, 2018 at 03:24:41PM +0200, jan.tuerk at emtrion.com wrote:
+On Fri, Apr 27, 2018 at 03:24:41PM +0200, jan.tuerk@emtrion.com wrote:
 > From: Jan Tuerk <jan.tuerk@emtrion.com>
 > 
 > This patch adds support for the emtrion GmbH emCON-MX6 modules.
@@ -205,7 +205,7 @@ Why do you need this boardID alias?
 > +		stdout-path = <&uart1>;
 > +	};
 > +
-> +	memory at 10000000 {
+> +	memory@10000000 {
 > +		reg = <0x10000000 0x40000000>;
 > +	};
 > +
@@ -329,7 +329,7 @@ device node, like pinctrl_nor_flash and pinctrl_usdhc2 here.
 > +	pinctrl-0 = <&pinctrl_i2c3>;
 > +	status = "okay";
 > +
-> +	sgtl5000: audio-codec at a {
+> +	sgtl5000: audio-codec@a {
 > +		compatible = "fsl,sgtl5000";
 > +		reg = <0x0a>;
 > +		#sound-dai-cells = <0>;
@@ -338,14 +338,14 @@ device node, like pinctrl_nor_flash and pinctrl_usdhc2 here.
 > +		VDDIO-supply = <&reg_base3p3>;
 > +	};
 > +
-> +	boardID: gpio at 3a {
+> +	boardID: gpio@3a {
 > +		compatible = "nxp,pca8574";
 > +		reg = <0x3a>;
 > +		gpio-controller;
 > +		#gpio-cells = <1>;
 > +	};
 > +
-> +	captouch: touchscreen at 38 {
+> +	captouch: touchscreen@38 {
 > +		compatible = "edt,edt-ft5406";
 > +		reg = <0x38>;
 > +		pinctrl-names = "default";
@@ -514,7 +514,7 @@ display for node name.
 > +		pinctrl-0 = <&pinctrl_rgb24_display>;
 > +		status = "disabled";
 > +
-> +		port at 0 {
+> +		port@0 {
 > +			reg = <0>;
 > +
 > +			rgb_encoder_in: endpoint {
@@ -522,7 +522,7 @@ display for node name.
 > +			};
 > +		};
 > +
-> +		port at 1 {
+> +		port@1 {
 > +			reg = <1>;
 > +
 > +			rgb_encoder_out: endpoint {
@@ -626,7 +626,7 @@ One newline.
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +
-> +		ksz9031: phy at 0 {
+> +		ksz9031: phy@0 {
 > +			compatible = "ethernet-phy-ieee802.3-c22";
 > +			reg = <0>;
 > +			interrupt-parent = <&gpio1>;
@@ -653,7 +653,7 @@ One newline.
 > +	pinctrl-0 = <&pinctrl_i2c1>;
 > +	status = "okay";
 > +
-> +	rtc: rtc at 68 {
+> +	rtc: rtc@68 {
 
 Is the label actually used?  If yes, I would suggest a more specific
 name like ds1307.
@@ -662,7 +662,7 @@ name like ds1307.
 > +		reg = <0x68>;
 > +	};
 > +
-> +	da9063: pmic at 58 {
+> +	da9063: pmic@58 {
 > +		compatible = "dlg,da9063";
 > +		reg = <0x58>;
 > +		pinctrl-names = "default";
@@ -1291,4 +1291,8 @@ Shawn
 > +};
 > -- 
 > 2.11.0
->
+> 
+_______________________________________________
+dri-devel mailing list
+dri-devel@lists.freedesktop.org
+https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index 21643de..eeb5d43 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,13 +1,24 @@
  "ref\020180420125108.14197-1-jan.tuerk@emtrion.com\0"
  "ref\020180427132445.3458-1-jan.tuerk@emtrion.com\0"
  "ref\020180427132445.3458-7-jan.tuerk@emtrion.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH v4 6/7] ARM: dts: Add support for emtrion emCON-MX6 series\0"
+ "From\0Shawn Guo <shawnguo@kernel.org>\0"
+ "Subject\0Re: [PATCH v4 6/7] ARM: dts: Add support for emtrion emCON-MX6 series\0"
  "Date\0Sat, 28 Apr 2018 11:12:32 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0jan.tuerk@emtrion.com\0"
+ "Cc\0Mark Rutland <mark.rutland@arm.com>"
+  devicetree@vger.kernel.org
+  David Airlie <airlied@linux.ie>
+  Russell King <linux@armlinux.org.uk>
+  dri-devel@lists.freedesktop.org
+  linux-kernel@vger.kernel.org
+  Rob Herring <robh+dt@kernel.org>
+  Thierry Reding <thierry.reding@gmail.com>
+  Pengutronix Kernel Team <kernel@pengutronix.de>
+  Fabio Estevam <fabio.estevam@nxp.com>
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
- "On Fri, Apr 27, 2018 at 03:24:41PM +0200, jan.tuerk at emtrion.com wrote:\n"
+ "On Fri, Apr 27, 2018 at 03:24:41PM +0200, jan.tuerk@emtrion.com wrote:\n"
  "> From: Jan Tuerk <jan.tuerk@emtrion.com>\n"
  "> \n"
  "> This patch adds support for the emtrion GmbH emCON-MX6 modules.\n"
@@ -214,7 +225,7 @@
  "> +\t\tstdout-path = <&uart1>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tmemory at 10000000 {\n"
+ "> +\tmemory@10000000 {\n"
  "> +\t\treg = <0x10000000 0x40000000>;\n"
  "> +\t};\n"
  "> +\n"
@@ -338,7 +349,7 @@
  "> +\tpinctrl-0 = <&pinctrl_i2c3>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\tsgtl5000: audio-codec at a {\n"
+ "> +\tsgtl5000: audio-codec@a {\n"
  "> +\t\tcompatible = \"fsl,sgtl5000\";\n"
  "> +\t\treg = <0x0a>;\n"
  "> +\t\t#sound-dai-cells = <0>;\n"
@@ -347,14 +358,14 @@
  "> +\t\tVDDIO-supply = <&reg_base3p3>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tboardID: gpio at 3a {\n"
+ "> +\tboardID: gpio@3a {\n"
  "> +\t\tcompatible = \"nxp,pca8574\";\n"
  "> +\t\treg = <0x3a>;\n"
  "> +\t\tgpio-controller;\n"
  "> +\t\t#gpio-cells = <1>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tcaptouch: touchscreen at 38 {\n"
+ "> +\tcaptouch: touchscreen@38 {\n"
  "> +\t\tcompatible = \"edt,edt-ft5406\";\n"
  "> +\t\treg = <0x38>;\n"
  "> +\t\tpinctrl-names = \"default\";\n"
@@ -523,7 +534,7 @@
  "> +\t\tpinctrl-0 = <&pinctrl_rgb24_display>;\n"
  "> +\t\tstatus = \"disabled\";\n"
  "> +\n"
- "> +\t\tport at 0 {\n"
+ "> +\t\tport@0 {\n"
  "> +\t\t\treg = <0>;\n"
  "> +\n"
  "> +\t\t\trgb_encoder_in: endpoint {\n"
@@ -531,7 +542,7 @@
  "> +\t\t\t};\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tport at 1 {\n"
+ "> +\t\tport@1 {\n"
  "> +\t\t\treg = <1>;\n"
  "> +\n"
  "> +\t\t\trgb_encoder_out: endpoint {\n"
@@ -635,7 +646,7 @@
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\n"
- "> +\t\tksz9031: phy at 0 {\n"
+ "> +\t\tksz9031: phy@0 {\n"
  "> +\t\t\tcompatible = \"ethernet-phy-ieee802.3-c22\";\n"
  "> +\t\t\treg = <0>;\n"
  "> +\t\t\tinterrupt-parent = <&gpio1>;\n"
@@ -662,7 +673,7 @@
  "> +\tpinctrl-0 = <&pinctrl_i2c1>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\trtc: rtc at 68 {\n"
+ "> +\trtc: rtc@68 {\n"
  "\n"
  "Is the label actually used?  If yes, I would suggest a more specific\n"
  "name like ds1307.\n"
@@ -671,7 +682,7 @@
  "> +\t\treg = <0x68>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tda9063: pmic at 58 {\n"
+ "> +\tda9063: pmic@58 {\n"
  "> +\t\tcompatible = \"dlg,da9063\";\n"
  "> +\t\treg = <0x58>;\n"
  "> +\t\tpinctrl-names = \"default\";\n"
@@ -1300,6 +1311,10 @@
  "> +};\n"
  "> -- \n"
  "> 2.11.0\n"
- >
+ "> \n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ https://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-8e28f8178d99ce263571b97603cb2fa9e00c8c7ea5e5f30f14cba6f13c475309
+2c0605a62784914656468ef54fc606d31c6a4f960377c33c9e0751353103973a
