diff for duplicates of <52F8D2F2.7080703@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index c63c1ac..6f2b9b6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,8 @@ On 10-02-2014 16:54, Ben Dooks wrote: >> 1 file changed, 14 insertions(+), 1 deletion(-) >> Index: renesas/arch/arm/boot/dts/r8a7791.dtsi ->> =================================>> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi +>> =================================================================== +>> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi >> +++ renesas/arch/arm/boot/dts/r8a7791.dtsi >> @@ -2,7 +2,8 @@ >> * Device Tree Source for the r8a7791 SoC @@ -27,7 +28,7 @@ On 10-02-2014 16:54, Ben Dooks wrote: >> status = "disabled"; >> }; >> ->> + ether: ethernet@ee700000 { +>> + ether: ethernet at ee700000 { >> + compatible = "renesas,ether-r8a7791"; >> + reg = <0 0xee700000 0 0x400>; >> + interrupt-parent = <&gic>; diff --git a/a/content_digest b/N1/content_digest index eb5f3b4..e250490 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\0201402070112.48304.sergei.shtylyov@cogentembedded.com\0" "ref\052F8CBFB.5060707@codethink.co.uk\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" - "Subject\0Re: [PATCH 1/2] ARM: shmobile: r8a7791: add Ether DT support\0" - "Date\0Mon, 10 Feb 2014 13:24:02 +0000\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" + "Subject\0[PATCH 1/2] ARM: shmobile: r8a7791: add Ether DT support\0" + "Date\0Mon, 10 Feb 2014 17:24:02 +0400\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -19,7 +19,8 @@ ">> 1 file changed, 14 insertions(+), 1 deletion(-)\n" "\n" ">> Index: renesas/arch/arm/boot/dts/r8a7791.dtsi\n" - ">> =================================>> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi\n" + ">> ===================================================================\n" + ">> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi\n" ">> +++ renesas/arch/arm/boot/dts/r8a7791.dtsi\n" ">> @@ -2,7 +2,8 @@\n" ">> * Device Tree Source for the r8a7791 SoC\n" @@ -35,7 +36,7 @@ ">> status = \"disabled\";\n" ">> };\n" ">>\n" - ">> + ether: ethernet@ee700000 {\n" + ">> + ether: ethernet at ee700000 {\n" ">> + compatible = \"renesas,ether-r8a7791\";\n" ">> + reg = <0 0xee700000 0 0x400>;\n" ">> + interrupt-parent = <&gic>;\n" @@ -53,4 +54,4 @@ "\n" WBR, Sergei -9554172fce3235e702434671a9d1bdae7c5086a08367a457c14a9d5c6d3d4b6d +9a501f5dcde02f324bdb2229a7f34595041c5a32166d40a200252ae5b41adf5a
diff --git a/a/1.txt b/N2/1.txt index c63c1ac..88efb15 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -11,7 +11,8 @@ On 10-02-2014 16:54, Ben Dooks wrote: >> 1 file changed, 14 insertions(+), 1 deletion(-) >> Index: renesas/arch/arm/boot/dts/r8a7791.dtsi ->> =================================>> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi +>> =================================================================== +>> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi >> +++ renesas/arch/arm/boot/dts/r8a7791.dtsi >> @@ -2,7 +2,8 @@ >> * Device Tree Source for the r8a7791 SoC diff --git a/a/content_digest b/N2/content_digest index eb5f3b4..fcb1af2 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,19 @@ "ref\052F8CBFB.5060707@codethink.co.uk\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH 1/2] ARM: shmobile: r8a7791: add Ether DT support\0" - "Date\0Mon, 10 Feb 2014 13:24:02 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Mon, 10 Feb 2014 17:24:02 +0400\0" + "To\0Ben Dooks <ben.dooks@codethink.co.uk>\0" + "Cc\0horms@verge.net.au" + linux-sh@vger.kernel.org + devicetree@vger.kernel.org + robh+dt@kernel.org + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + magnus.damm@gmail.com + linux@arm.linux.org.uk + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hello.\n" @@ -19,7 +30,8 @@ ">> 1 file changed, 14 insertions(+), 1 deletion(-)\n" "\n" ">> Index: renesas/arch/arm/boot/dts/r8a7791.dtsi\n" - ">> =================================>> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi\n" + ">> ===================================================================\n" + ">> --- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi\n" ">> +++ renesas/arch/arm/boot/dts/r8a7791.dtsi\n" ">> @@ -2,7 +2,8 @@\n" ">> * Device Tree Source for the r8a7791 SoC\n" @@ -53,4 +65,4 @@ "\n" WBR, Sergei -9554172fce3235e702434671a9d1bdae7c5086a08367a457c14a9d5c6d3d4b6d +904e1f24d2d58412739077ec14c88911d0d00abeb8c638bdf32bcbac35ef0cb3
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.