diff for duplicates of <20170726120534.5516-5-linux-kernel-dev@beckhoff.com> diff --git a/a/1.txt b/N1/1.txt index 8ff109c..c446f89 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -69,7 +69,7 @@ index 000000000000..4f54fd4418a3 + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu_disp0>; + -+ port at 0 { ++ port@0 { + reg = <0>; + + display0_in: endpoint { @@ -77,7 +77,7 @@ index 000000000000..4f54fd4418a3 + }; + }; + -+ port at 1 { ++ port@1 { + reg = <1>; + + display0_out: endpoint { @@ -103,7 +103,7 @@ index 000000000000..4f54fd4418a3 + #size-cells = <0>; + compatible = "ti,tfp410"; + -+ port at 0 { ++ port@0 { + reg = <0>; + + tfp410_in: endpoint { @@ -111,7 +111,7 @@ index 000000000000..4f54fd4418a3 + }; + }; + -+ port at 1 { ++ port@1 { + reg = <1>; + + tfp410_out: endpoint { diff --git a/a/content_digest b/N1/content_digest index 526c6d9..8cd4dfa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,18 @@ "ref\020170726120534.5516-1-linux-kernel-dev@beckhoff.com\0" - "From\0linux-kernel-dev@beckhoff.com (linux-kernel-dev at beckhoff.com)\0" + "From\0<linux-kernel-dev@beckhoff.com>\0" "Subject\0[PATCH v5 4/4] ARM: dts: imx: add CX9020 Embedded PC device tree\0" "Date\0Wed, 26 Jul 2017 14:05:34 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0robh+dt@kernel.org" + " shawnguo@kernel.org\0" + "Cc\0mark.rutland@arm.com" + kernel@pengutronix.de + fabio.estevam@nxp.com + linux@armlinux.org.uk + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + andrew@lunn.ch + " Patrick Bruenn <p.bruenn@beckhoff.com>\0" "\00:1\0" "b\0" "From: Patrick Bruenn <p.bruenn@beckhoff.com>\n" @@ -76,7 +86,7 @@ "+\t\tpinctrl-names = \"default\";\n" "+\t\tpinctrl-0 = <&pinctrl_ipu_disp0>;\n" "+\n" - "+\t\tport at 0 {\n" + "+\t\tport@0 {\n" "+\t\t\treg = <0>;\n" "+\n" "+\t\t\tdisplay0_in: endpoint {\n" @@ -84,7 +94,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\tdisplay0_out: endpoint {\n" @@ -110,7 +120,7 @@ "+\t\t#size-cells = <0>;\n" "+\t\tcompatible = \"ti,tfp410\";\n" "+\n" - "+\t\tport at 0 {\n" + "+\t\tport@0 {\n" "+\t\t\treg = <0>;\n" "+\n" "+\t\t\ttfp410_in: endpoint {\n" @@ -118,7 +128,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\ttfp410_out: endpoint {\n" @@ -340,4 +350,4 @@ "-- \n" 2.11.0 -8022d0ee2f47462bc82e4cbed1777a5e8115c04612dce519b51ef839c18f6c27 +6c8ed0f059a5f917b34ba56de885732de6c4e8cc3929ad83b495cfcf45a8de00
diff --git a/a/1.txt b/N2/1.txt index 8ff109c..c446f89 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -69,7 +69,7 @@ index 000000000000..4f54fd4418a3 + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu_disp0>; + -+ port at 0 { ++ port@0 { + reg = <0>; + + display0_in: endpoint { @@ -77,7 +77,7 @@ index 000000000000..4f54fd4418a3 + }; + }; + -+ port at 1 { ++ port@1 { + reg = <1>; + + display0_out: endpoint { @@ -103,7 +103,7 @@ index 000000000000..4f54fd4418a3 + #size-cells = <0>; + compatible = "ti,tfp410"; + -+ port at 0 { ++ port@0 { + reg = <0>; + + tfp410_in: endpoint { @@ -111,7 +111,7 @@ index 000000000000..4f54fd4418a3 + }; + }; + -+ port at 1 { ++ port@1 { + reg = <1>; + + tfp410_out: endpoint { diff --git a/a/content_digest b/N2/content_digest index 526c6d9..c9cd392 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,18 @@ "ref\020170726120534.5516-1-linux-kernel-dev@beckhoff.com\0" - "From\0linux-kernel-dev@beckhoff.com (linux-kernel-dev at beckhoff.com)\0" + "From\0<linux-kernel-dev@beckhoff.com>\0" "Subject\0[PATCH v5 4/4] ARM: dts: imx: add CX9020 Embedded PC device tree\0" "Date\0Wed, 26 Jul 2017 14:05:34 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0<robh+dt@kernel.org>" + " <shawnguo@kernel.org>\0" + "Cc\0<mark.rutland@arm.com>" + <kernel@pengutronix.de> + <fabio.estevam@nxp.com> + <linux@armlinux.org.uk> + <devicetree@vger.kernel.org> + <linux-kernel@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + <andrew@lunn.ch> + " Patrick Bruenn <p.bruenn@beckhoff.com>\0" "\00:1\0" "b\0" "From: Patrick Bruenn <p.bruenn@beckhoff.com>\n" @@ -76,7 +86,7 @@ "+\t\tpinctrl-names = \"default\";\n" "+\t\tpinctrl-0 = <&pinctrl_ipu_disp0>;\n" "+\n" - "+\t\tport at 0 {\n" + "+\t\tport@0 {\n" "+\t\t\treg = <0>;\n" "+\n" "+\t\t\tdisplay0_in: endpoint {\n" @@ -84,7 +94,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\tdisplay0_out: endpoint {\n" @@ -110,7 +120,7 @@ "+\t\t#size-cells = <0>;\n" "+\t\tcompatible = \"ti,tfp410\";\n" "+\n" - "+\t\tport at 0 {\n" + "+\t\tport@0 {\n" "+\t\t\treg = <0>;\n" "+\n" "+\t\t\ttfp410_in: endpoint {\n" @@ -118,7 +128,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\ttfp410_out: endpoint {\n" @@ -340,4 +350,4 @@ "-- \n" 2.11.0 -8022d0ee2f47462bc82e4cbed1777a5e8115c04612dce519b51ef839c18f6c27 +f657f74a6dc3c13ffce5480e458fc5350ae2d05e54dea28742cefb577fbb28fb
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.