diff for duplicates of <20180701082508.GI4348@dragon> diff --git a/a/1.txt b/N1/1.txt index d59580e..0dda80a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -59,7 +59,7 @@ On Thu, Jun 21, 2018 at 08:44:59PM +0300, Andrey Gusakov wrote: > + #size-cells = <0>; > + status = "okay"; > + -> + switch at 0 { +> + switch@0 { > + compatible = "marvell,mv88e6085"; > + reg = <0>; > + dsa,member = <0 0>; @@ -73,27 +73,27 @@ On Thu, Jun 21, 2018 at 08:44:59PM +0300, Andrey Gusakov wrote: > + #address-cells = <1>; > + #size-cells = <0>; > + -> + port at 0 { +> + port@0 { > + reg = <0>; > + label = "port1"; > + }; > + -> + port at 1 { +> + port@1 { > + reg = <1>; > + label = "port2"; > + }; > + -> + port at 2 { +> + port@2 { > + reg = <2>; > + label = "port3"; > + }; > + -> + port at 3 { +> + port@3 { > + reg = <3>; > + label = "scu2scu"; > + }; > + -> + port at 4 { +> + port@4 { > + reg = <4>; > + label = "esb2host"; > + }; @@ -102,7 +102,7 @@ Please constantly have newline between nodes. Shawn -> + port at 5 { +> + port@5 { > + reg = <5>; > + label = "esb2mezz"; > + phy-mode = "sgmii"; @@ -112,7 +112,7 @@ Shawn > + full-duplex; > + }; > + }; -> + port at 6 { +> + port@6 { > + reg = <6>; > + label = "cpu"; > + phy-mode = "mii"; @@ -129,7 +129,7 @@ Shawn > +}; > + > +&i2c2 { -> + lm75 at 48 { +> + lm75@48 { > + compatible = "national,lm75"; > + reg = <0x48>; > + }; diff --git a/a/content_digest b/N1/content_digest index 8b9f046..ff2d44d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,21 @@ "ref\01529603100-31958-1-git-send-email-andrey.gusakov@cogentembedded.com\0" "ref\01529603100-31958-3-git-send-email-andrey.gusakov@cogentembedded.com\0" - "From\0shawnguo@kernel.org (Shawn Guo)\0" - "Subject\0[PATCH 2/3] ARM: dts: imx: add ZII SCU2 ESB board\0" + "From\0Shawn Guo <shawnguo@kernel.org>\0" + "Subject\0Re: [PATCH 2/3] ARM: dts: imx: add ZII SCU2 ESB board\0" "Date\0Sun, 1 Jul 2018 16:25:09 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Andrey Gusakov <andrey.gusakov@cogentembedded.com>\0" + "Cc\0Mark Rutland <mark.rutland@arm.com>" + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + andrew.smirnov@gmail.com + Sascha Hauer <s.hauer@pengutronix.de> + linux-kernel@vger.kernel.org + Rob Herring <robh+dt@kernel.org> + NXP Linux Team <linux-imx@nxp.com> + Pengutronix Kernel Team <kernel@pengutronix.de> + Fabio Estevam <fabio.estevam@nxp.com> + cphealy@gmail.com + " l.stach@pengutronix.de\0" "\00:1\0" "b\0" "On Thu, Jun 21, 2018 at 08:44:59PM +0300, Andrey Gusakov wrote:\n" @@ -67,7 +79,7 @@ "> +\t\t#size-cells = <0>;\n" "> +\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\tswitch at 0 {\n" + "> +\t\tswitch@0 {\n" "> +\t\t\tcompatible = \"marvell,mv88e6085\";\n" "> +\t\t\treg = <0>;\n" "> +\t\t\tdsa,member = <0 0>;\n" @@ -81,27 +93,27 @@ "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" "> +\n" - "> +\t\t\t\tport at 0 {\n" + "> +\t\t\t\tport@0 {\n" "> +\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t\tlabel = \"port1\";\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tport at 1 {\n" + "> +\t\t\t\tport@1 {\n" "> +\t\t\t\t\treg = <1>;\n" "> +\t\t\t\t\tlabel = \"port2\";\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 = \"port3\";\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 = \"scu2scu\";\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tport at 4 {\n" + "> +\t\t\t\tport@4 {\n" "> +\t\t\t\t\treg = <4>;\n" "> +\t\t\t\t\tlabel = \"esb2host\";\n" "> +\t\t\t\t};\n" @@ -110,7 +122,7 @@ "\n" "Shawn\n" "\n" - "> +\t\t\t\tport at 5 {\n" + "> +\t\t\t\tport@5 {\n" "> +\t\t\t\t\treg = <5>;\n" "> +\t\t\t\t\tlabel = \"esb2mezz\";\n" "> +\t\t\t\t\tphy-mode = \"sgmii\";\n" @@ -120,7 +132,7 @@ "> +\t\t\t\t\t\tfull-duplex;\n" "> +\t\t\t\t\t};\n" "> +\t\t\t\t};\n" - "> +\t\t\t\tport at 6 {\n" + "> +\t\t\t\tport@6 {\n" "> +\t\t\t\t\treg = <6>;\n" "> +\t\t\t\t\tlabel = \"cpu\";\n" "> +\t\t\t\t\tphy-mode = \"mii\";\n" @@ -137,7 +149,7 @@ "> +};\n" "> +\n" "> +&i2c2 {\n" - "> +\tlm75 at 48 {\n" + "> +\tlm75@48 {\n" "> +\t\tcompatible = \"national,lm75\";\n" "> +\t\treg = <0x48>;\n" "> +\t};\n" @@ -224,4 +236,4 @@ "> 1.9.1\n" > -772ac780100cf8b19f19094a39dafafdb30a0687b8003a2d75186267997f0ea9 +515f194242829f73b2bae605c04766439c53d9b5905183c8aceaf2d129736c14
diff --git a/a/1.txt b/N2/1.txt index d59580e..0dda80a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -59,7 +59,7 @@ On Thu, Jun 21, 2018 at 08:44:59PM +0300, Andrey Gusakov wrote: > + #size-cells = <0>; > + status = "okay"; > + -> + switch at 0 { +> + switch@0 { > + compatible = "marvell,mv88e6085"; > + reg = <0>; > + dsa,member = <0 0>; @@ -73,27 +73,27 @@ On Thu, Jun 21, 2018 at 08:44:59PM +0300, Andrey Gusakov wrote: > + #address-cells = <1>; > + #size-cells = <0>; > + -> + port at 0 { +> + port@0 { > + reg = <0>; > + label = "port1"; > + }; > + -> + port at 1 { +> + port@1 { > + reg = <1>; > + label = "port2"; > + }; > + -> + port at 2 { +> + port@2 { > + reg = <2>; > + label = "port3"; > + }; > + -> + port at 3 { +> + port@3 { > + reg = <3>; > + label = "scu2scu"; > + }; > + -> + port at 4 { +> + port@4 { > + reg = <4>; > + label = "esb2host"; > + }; @@ -102,7 +102,7 @@ Please constantly have newline between nodes. Shawn -> + port at 5 { +> + port@5 { > + reg = <5>; > + label = "esb2mezz"; > + phy-mode = "sgmii"; @@ -112,7 +112,7 @@ Shawn > + full-duplex; > + }; > + }; -> + port at 6 { +> + port@6 { > + reg = <6>; > + label = "cpu"; > + phy-mode = "mii"; @@ -129,7 +129,7 @@ Shawn > +}; > + > +&i2c2 { -> + lm75 at 48 { +> + lm75@48 { > + compatible = "national,lm75"; > + reg = <0x48>; > + }; diff --git a/a/content_digest b/N2/content_digest index 8b9f046..633306f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,21 @@ "ref\01529603100-31958-1-git-send-email-andrey.gusakov@cogentembedded.com\0" "ref\01529603100-31958-3-git-send-email-andrey.gusakov@cogentembedded.com\0" - "From\0shawnguo@kernel.org (Shawn Guo)\0" - "Subject\0[PATCH 2/3] ARM: dts: imx: add ZII SCU2 ESB board\0" + "From\0Shawn Guo <shawnguo@kernel.org>\0" + "Subject\0Re: [PATCH 2/3] ARM: dts: imx: add ZII SCU2 ESB board\0" "Date\0Sun, 1 Jul 2018 16:25:09 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Andrey Gusakov <andrey.gusakov@cogentembedded.com>\0" + "Cc\0Sascha Hauer <s.hauer@pengutronix.de>" + Pengutronix Kernel Team <kernel@pengutronix.de> + Fabio Estevam <fabio.estevam@nxp.com> + NXP Linux Team <linux-imx@nxp.com> + Rob Herring <robh+dt@kernel.org> + Mark Rutland <mark.rutland@arm.com> + cphealy@gmail.com + andrew.smirnov@gmail.com + l.stach@pengutronix.de + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On Thu, Jun 21, 2018 at 08:44:59PM +0300, Andrey Gusakov wrote:\n" @@ -67,7 +79,7 @@ "> +\t\t#size-cells = <0>;\n" "> +\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\tswitch at 0 {\n" + "> +\t\tswitch@0 {\n" "> +\t\t\tcompatible = \"marvell,mv88e6085\";\n" "> +\t\t\treg = <0>;\n" "> +\t\t\tdsa,member = <0 0>;\n" @@ -81,27 +93,27 @@ "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" "> +\n" - "> +\t\t\t\tport at 0 {\n" + "> +\t\t\t\tport@0 {\n" "> +\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t\tlabel = \"port1\";\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tport at 1 {\n" + "> +\t\t\t\tport@1 {\n" "> +\t\t\t\t\treg = <1>;\n" "> +\t\t\t\t\tlabel = \"port2\";\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 = \"port3\";\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 = \"scu2scu\";\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tport at 4 {\n" + "> +\t\t\t\tport@4 {\n" "> +\t\t\t\t\treg = <4>;\n" "> +\t\t\t\t\tlabel = \"esb2host\";\n" "> +\t\t\t\t};\n" @@ -110,7 +122,7 @@ "\n" "Shawn\n" "\n" - "> +\t\t\t\tport at 5 {\n" + "> +\t\t\t\tport@5 {\n" "> +\t\t\t\t\treg = <5>;\n" "> +\t\t\t\t\tlabel = \"esb2mezz\";\n" "> +\t\t\t\t\tphy-mode = \"sgmii\";\n" @@ -120,7 +132,7 @@ "> +\t\t\t\t\t\tfull-duplex;\n" "> +\t\t\t\t\t};\n" "> +\t\t\t\t};\n" - "> +\t\t\t\tport at 6 {\n" + "> +\t\t\t\tport@6 {\n" "> +\t\t\t\t\treg = <6>;\n" "> +\t\t\t\t\tlabel = \"cpu\";\n" "> +\t\t\t\t\tphy-mode = \"mii\";\n" @@ -137,7 +149,7 @@ "> +};\n" "> +\n" "> +&i2c2 {\n" - "> +\tlm75 at 48 {\n" + "> +\tlm75@48 {\n" "> +\t\tcompatible = \"national,lm75\";\n" "> +\t\treg = <0x48>;\n" "> +\t};\n" @@ -224,4 +236,4 @@ "> 1.9.1\n" > -772ac780100cf8b19f19094a39dafafdb30a0687b8003a2d75186267997f0ea9 +342142de45a82700ae350088769c1c97ddadb8e3aa999f60c5d397436470d274
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.