diff for duplicates of <5bea0e99.1c69fb81.18be0.5162@mx.google.com>

diff --git a/a/1.txt b/N1/1.txt
index 263f65d..acc474e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,4 +1,4 @@
-On Thu, Nov 01, 2018 at 03:43:26PM +0000, Vok?? Michal wrote:
+On Thu, Nov 01, 2018 at 03:43:26PM +0000, Vokáč Michal wrote:
 > These are i.MX6S/DL based SBCs embedded in various Y Soft products.
 > All share the same board design but have slightly different HW
 > configuration.
@@ -30,7 +30,7 @@ On Thu, Nov 01, 2018 at 03:43:26PM +0000, Vok?? Michal wrote:
 > - miniPCIe slot
 > 
 > Cc: Andrew Lunn <andrew@lunn.ch>
-> Signed-off-by: Michal Vok?? <michal.vokac@ysoft.com>
+> Signed-off-by: Michal Vokáč <michal.vokac@ysoft.com>
 > ---
 > 
 > All the boards are booting fine but not everything is enabled/supported
@@ -111,7 +111,7 @@ On Thu, Nov 01, 2018 at 03:43:26PM +0000, Vok?? Michal wrote:
 > +		pinctrl-0 = <&pinctrl_ipu1>;
 > +		status = "disabled";
 > +
-> +		port at 0 {
+> +		port@0 {
 > +			reg = <0>;
 > +
 > +			lcd_display_in: endpoint {
@@ -119,7 +119,7 @@ On Thu, Nov 01, 2018 at 03:43:26PM +0000, Vok?? Michal wrote:
 > +			};
 > +		};
 > +
-> +		port at 1 {
+> +		port@1 {
 > +			reg = <1>;
 > +
 > +			lcd_display_out: endpoint {
@@ -148,7 +148,7 @@ On Thu, Nov 01, 2018 at 03:43:26PM +0000, Vok?? Michal wrote:
 These are all just individual board level regulators? If so, drop the 
 simple-bus and move these up to the top-level.
 > +
-> +		reg_usb_otg_vbus: regulator at 0 {
+> +		reg_usb_otg_vbus: regulator@0 {
 > +			compatible = "regulator-fixed";
 > +			reg = <0>;
 
@@ -164,7 +164,7 @@ Dropping reg and unit-address in the process.
 > +			status = "okay";
 > +		};
 > +
-> +		reg_usb_h1_vbus: regulator at 1 {
+> +		reg_usb_h1_vbus: regulator@1 {
 > +			compatible = "regulator-fixed";
 > +			reg = <1>;
 > +			pinctrl-names = "default";
@@ -177,7 +177,7 @@ Dropping reg and unit-address in the process.
 > +			status = "disabled";
 > +		};
 > +
-> +		reg_pcie: regulator at 2 {
+> +		reg_pcie: regulator@2 {
 > +			compatible = "regulator-fixed";
 > +			reg = <2>;
 > +			pinctrl-names = "default";
@@ -206,15 +206,15 @@ Dropping reg and unit-address in the process.
 > +		#address-cells = <1>;
 > +		#size-cells = <0>;
 > +
-> +		phy_port2: phy at 1 {
+> +		phy_port2: phy@1 {
 > +			reg = <1>;
 > +		};
 > +
-> +		phy_port3: phy at 2 {
+> +		phy_port3: phy@2 {
 > +			reg = <2>;
 > +		};
 > +
-> +		switch at 0 {
+> +		switch@0 {
 > +			compatible = "qca,qca8334";
 > +			reg = <0>;
 > +
@@ -222,7 +222,7 @@ Dropping reg and unit-address in the process.
 > +				#address-cells = <1>;
 > +				#size-cells = <0>;
 > +
-> +				ethphy0: port at 0 {
+> +				ethphy0: port@0 {
 > +					reg = <0>;
 > +					label = "cpu";
 > +					phy-mode = "rgmii";
@@ -233,13 +233,13 @@ Dropping reg and unit-address in the process.
 > +					};
 > +				};
 > +
-> +				port at 2 {
+> +				port@2 {
 > +					reg = <2>;
 > +					label = "eth2";
 > +					phy-handle = <&phy_port2>;
 > +				};
 > +
-> +				port at 3 {
+> +				port@3 {
 > +					reg = <3>;
 > +					label = "eth1";
 > +					phy-handle = <&phy_port3>;
@@ -255,16 +255,16 @@ Dropping reg and unit-address in the process.
 > +	pinctrl-0 = <&pinctrl_i2c2>;
 > +	status = "okay";
 > +
-> +	eeprom at 57 {
+> +	eeprom@57 {
 > +		compatible = "atmel,24c128";
 > +		reg = <0x57>;
 > +		pagesize = <64>;
 > +		status = "okay";
 > +	};
 > +
-> +	leds: leds at 30 {
+> +	leds: leds@30 {
 
-led-controller at ...
+led-controller@...
 
 > +		compatible = "ti,lp5562";
 > +		label = "lp5562_leds";
@@ -302,9 +302,9 @@ on all boards and enabled or be moved to the per board dts.
 > +		};
 > +	};
 > +
-> +	pfuze200 at 8 {
+> +	pfuze200@8 {
 
-pmic at 8
+pmic@8
 
 > +		compatible = "fsl,pfuze200";
 > +		pinctrl-names = "default";
@@ -659,10 +659,10 @@ Is this documented?
 
 > +
 > +	cpus {
-> +		/delete-node/ cpu at 1;
+> +		/delete-node/ cpu@1;
 > +	};
 > +
-> +	memory at 10000000 {
+> +	memory@10000000 {
 > +		reg = <0x10000000 0x20000000>;
 > +	};
 > +};
@@ -721,7 +721,7 @@ Is this documented?
 > +	model = "Y Soft IOTA Hydra i.MX6DualLite board";
 > +	compatible = "ysoft,imx6dl-yapp4-hydra", "fsl,imx6dl";
 > +
-> +	memory at 10000000 {
+> +	memory@10000000 {
 > +		reg = <0x10000000 0x80000000>;
 > +	};
 > +};
@@ -761,10 +761,10 @@ Is this documented?
 > +	compatible = "ysoft,imx6dl-yapp4-ursa", "fsl,imx6dl";
 > +
 > +	cpus {
-> +		/delete-node/ cpu at 1;
+> +		/delete-node/ cpu@1;
 > +	};
 > +
-> +	memory at 10000000 {
+> +	memory@10000000 {
 > +		reg = <0x10000000 0x20000000>;
 > +	};
 > +};
@@ -790,7 +790,7 @@ Is this documented?
 > +};
 > +
 > +&switch_ports {
-> +	/delete-node/ port at 2;
+> +	/delete-node/ port@2;
 > +};
 > +
 > +&usbh1 {
@@ -802,4 +802,10 @@ Is this documented?
 > +};
 > -- 
 > 2.1.4
->
+> 
+
+
+_______________________________________________
+linux-arm-kernel mailing list
+linux-arm-kernel@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index ad42d40..8b034d0 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,11 +1,20 @@
  "ref\01541086962-52626-1-git-send-email-michal.vokac@ysoft.com\0"
- "From\0robh@kernel.org (Rob Herring)\0"
- "Subject\0[PATCH] ARM: dts: imx: Add Y Soft IOTA Draco, Hydra and Ursa boards\0"
+ "From\0Rob Herring <robh@kernel.org>\0"
+ "Subject\0Re: [PATCH] ARM: dts: imx: Add Y Soft IOTA Draco, Hydra and Ursa boards\0"
  "Date\0Mon, 12 Nov 2018 10:41:21 -0600\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Vok\303\241\304\215 Michal <Michal.Vokac@ysoft.com>\0"
+ "Cc\0Mark Rutland <mark.rutland@arm.com>"
+  devicetree@vger.kernel.org <devicetree@vger.kernel.org>
+  Andrew Lunn <andrew@lunn.ch>
+  Sascha Hauer <s.hauer@pengutronix.de>
+  linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>
+  NXP Linux Team <linux-imx@nxp.com>
+  Fabio Estevam <fabio.estevam@nxp.com>
+  Shawn Guo <shawnguo@kernel.org>
+ " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0"
  "\00:1\0"
  "b\0"
- "On Thu, Nov 01, 2018 at 03:43:26PM +0000, Vok?? Michal wrote:\n"
+ "On Thu, Nov 01, 2018 at 03:43:26PM +0000, Vok\303\241\304\215 Michal wrote:\n"
  "> These are i.MX6S/DL based SBCs embedded in various Y Soft products.\n"
  "> All share the same board design but have slightly different HW\n"
  "> configuration.\n"
@@ -37,7 +46,7 @@
  "> - miniPCIe slot\n"
  "> \n"
  "> Cc: Andrew Lunn <andrew@lunn.ch>\n"
- "> Signed-off-by: Michal Vok?? <michal.vokac@ysoft.com>\n"
+ "> Signed-off-by: Michal Vok\303\241\304\215 <michal.vokac@ysoft.com>\n"
  "> ---\n"
  "> \n"
  "> All the boards are booting fine but not everything is enabled/supported\n"
@@ -118,7 +127,7 @@
  "> +\t\tpinctrl-0 = <&pinctrl_ipu1>;\n"
  "> +\t\tstatus = \"disabled\";\n"
  "> +\n"
- "> +\t\tport at 0 {\n"
+ "> +\t\tport@0 {\n"
  "> +\t\t\treg = <0>;\n"
  "> +\n"
  "> +\t\t\tlcd_display_in: endpoint {\n"
@@ -126,7 +135,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\tlcd_display_out: endpoint {\n"
@@ -155,7 +164,7 @@
  "These are all just individual board level regulators? If so, drop the \n"
  "simple-bus and move these up to the top-level.\n"
  "> +\n"
- "> +\t\treg_usb_otg_vbus: regulator at 0 {\n"
+ "> +\t\treg_usb_otg_vbus: regulator@0 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <0>;\n"
  "\n"
@@ -171,7 +180,7 @@
  "> +\t\t\tstatus = \"okay\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\treg_usb_h1_vbus: regulator at 1 {\n"
+ "> +\t\treg_usb_h1_vbus: regulator@1 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <1>;\n"
  "> +\t\t\tpinctrl-names = \"default\";\n"
@@ -184,7 +193,7 @@
  "> +\t\t\tstatus = \"disabled\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\treg_pcie: regulator at 2 {\n"
+ "> +\t\treg_pcie: regulator@2 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <2>;\n"
  "> +\t\t\tpinctrl-names = \"default\";\n"
@@ -213,15 +222,15 @@
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <0>;\n"
  "> +\n"
- "> +\t\tphy_port2: phy at 1 {\n"
+ "> +\t\tphy_port2: phy@1 {\n"
  "> +\t\t\treg = <1>;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tphy_port3: phy at 2 {\n"
+ "> +\t\tphy_port3: phy@2 {\n"
  "> +\t\t\treg = <2>;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tswitch at 0 {\n"
+ "> +\t\tswitch@0 {\n"
  "> +\t\t\tcompatible = \"qca,qca8334\";\n"
  "> +\t\t\treg = <0>;\n"
  "> +\n"
@@ -229,7 +238,7 @@
  "> +\t\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t\t#size-cells = <0>;\n"
  "> +\n"
- "> +\t\t\t\tethphy0: port at 0 {\n"
+ "> +\t\t\t\tethphy0: port@0 {\n"
  "> +\t\t\t\t\treg = <0>;\n"
  "> +\t\t\t\t\tlabel = \"cpu\";\n"
  "> +\t\t\t\t\tphy-mode = \"rgmii\";\n"
@@ -240,13 +249,13 @@
  "> +\t\t\t\t\t};\n"
  "> +\t\t\t\t};\n"
  "> +\n"
- "> +\t\t\t\tport at 2 {\n"
+ "> +\t\t\t\tport@2 {\n"
  "> +\t\t\t\t\treg = <2>;\n"
  "> +\t\t\t\t\tlabel = \"eth2\";\n"
  "> +\t\t\t\t\tphy-handle = <&phy_port2>;\n"
  "> +\t\t\t\t};\n"
  "> +\n"
- "> +\t\t\t\tport at 3 {\n"
+ "> +\t\t\t\tport@3 {\n"
  "> +\t\t\t\t\treg = <3>;\n"
  "> +\t\t\t\t\tlabel = \"eth1\";\n"
  "> +\t\t\t\t\tphy-handle = <&phy_port3>;\n"
@@ -262,16 +271,16 @@
  "> +\tpinctrl-0 = <&pinctrl_i2c2>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\teeprom at 57 {\n"
+ "> +\teeprom@57 {\n"
  "> +\t\tcompatible = \"atmel,24c128\";\n"
  "> +\t\treg = <0x57>;\n"
  "> +\t\tpagesize = <64>;\n"
  "> +\t\tstatus = \"okay\";\n"
  "> +\t};\n"
  "> +\n"
- "> +\tleds: leds at 30 {\n"
+ "> +\tleds: leds@30 {\n"
  "\n"
- "led-controller at ...\n"
+ "led-controller@...\n"
  "\n"
  "> +\t\tcompatible = \"ti,lp5562\";\n"
  "> +\t\tlabel = \"lp5562_leds\";\n"
@@ -309,9 +318,9 @@
  "> +\t\t};\n"
  "> +\t};\n"
  "> +\n"
- "> +\tpfuze200 at 8 {\n"
+ "> +\tpfuze200@8 {\n"
  "\n"
- "pmic at 8\n"
+ "pmic@8\n"
  "\n"
  "> +\t\tcompatible = \"fsl,pfuze200\";\n"
  "> +\t\tpinctrl-names = \"default\";\n"
@@ -666,10 +675,10 @@
  "\n"
  "> +\n"
  "> +\tcpus {\n"
- "> +\t\t/delete-node/ cpu at 1;\n"
+ "> +\t\t/delete-node/ cpu@1;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tmemory at 10000000 {\n"
+ "> +\tmemory@10000000 {\n"
  "> +\t\treg = <0x10000000 0x20000000>;\n"
  "> +\t};\n"
  "> +};\n"
@@ -728,7 +737,7 @@
  "> +\tmodel = \"Y Soft IOTA Hydra i.MX6DualLite board\";\n"
  "> +\tcompatible = \"ysoft,imx6dl-yapp4-hydra\", \"fsl,imx6dl\";\n"
  "> +\n"
- "> +\tmemory at 10000000 {\n"
+ "> +\tmemory@10000000 {\n"
  "> +\t\treg = <0x10000000 0x80000000>;\n"
  "> +\t};\n"
  "> +};\n"
@@ -768,10 +777,10 @@
  "> +\tcompatible = \"ysoft,imx6dl-yapp4-ursa\", \"fsl,imx6dl\";\n"
  "> +\n"
  "> +\tcpus {\n"
- "> +\t\t/delete-node/ cpu at 1;\n"
+ "> +\t\t/delete-node/ cpu@1;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tmemory at 10000000 {\n"
+ "> +\tmemory@10000000 {\n"
  "> +\t\treg = <0x10000000 0x20000000>;\n"
  "> +\t};\n"
  "> +};\n"
@@ -797,7 +806,7 @@
  "> +};\n"
  "> +\n"
  "> +&switch_ports {\n"
- "> +\t/delete-node/ port at 2;\n"
+ "> +\t/delete-node/ port@2;\n"
  "> +};\n"
  "> +\n"
  "> +&usbh1 {\n"
@@ -809,6 +818,12 @@
  "> +};\n"
  "> -- \n"
  "> 2.1.4\n"
- >
+ "> \n"
+ "\n"
+ "\n"
+ "_______________________________________________\n"
+ "linux-arm-kernel mailing list\n"
+ "linux-arm-kernel@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-c9652f8f08de2df42d65b3c3fb333196269d76a4e76ce4d0384627faca9bf1ca
+252043997f11415b472b6c346d8386dec2eb6bc239c431d305fa1e8b1663903e
