diff for duplicates of <551AB78B.4000506@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 388600f..0ac7904 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,13 +17,14 @@ On 03/31/2015 03:21 AM, Simon Horman wrote: >> 1 file changed, 10 insertions(+) >> >> Index: renesas/arch/arm/boot/dts/r8a7790.dtsi ->> =================================>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi +>> =================================================================== +>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi >> +++ renesas/arch/arm/boot/dts/r8a7790.dtsi >> @@ -626,6 +626,16 @@ >> status = "disabled"; >> }; >> ->> + avb: ethernet@e6800000 { +>> + avb: ethernet at e6800000 { >> + compatible = "renesas,ravb-r8a7790"; I went the usual way here but I suspect that SoC part of the prop should diff --git a/a/content_digest b/N1/content_digest index b77ad20..c82c7a9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\01625400.M0MxPQybIy@wasted.cogentembedded.com\0" "ref\08163383.0UU0Q5gsLE@wasted.cogentembedded.com\0" "ref\020150331002113.GB16289@verge.net.au\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" - "Subject\0Re: [PATCH 2/2] ARM: shmobile: r8a7790: add EtherAVB DT support\0" - "Date\0Tue, 31 Mar 2015 15:04:43 +0000\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" + "Subject\0[PATCH 2/2] ARM: shmobile: r8a7790: add EtherAVB DT support\0" + "Date\0Tue, 31 Mar 2015 18:04:43 +0300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -26,13 +26,14 @@ ">> 1 file changed, 10 insertions(+)\n" ">>\n" ">> Index: renesas/arch/arm/boot/dts/r8a7790.dtsi\n" - ">> =================================>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi\n" + ">> ===================================================================\n" + ">> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi\n" ">> +++ renesas/arch/arm/boot/dts/r8a7790.dtsi\n" ">> @@ -626,6 +626,16 @@\n" ">> \t\tstatus = \"disabled\";\n" ">> \t};\n" ">>\n" - ">> +\tavb: ethernet@e6800000 {\n" + ">> +\tavb: ethernet at e6800000 {\n" ">> +\t\tcompatible = \"renesas,ravb-r8a7790\";\n" "\n" " I went the usual way here but I suspect that SoC part of the prop should \n" @@ -42,4 +43,4 @@ "\n" WBR, Sergei -8f6fbafb5cf1fb68142ad141c965aa53ef9c21083b7cd7cfe366822b5b6fe6e9 +1c3648525b95aa0ee0abbd443840378ed41d40d73116f659a430accaa2647f4b
diff --git a/a/1.txt b/N2/1.txt index 388600f..7b01ee7 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -17,7 +17,8 @@ On 03/31/2015 03:21 AM, Simon Horman wrote: >> 1 file changed, 10 insertions(+) >> >> Index: renesas/arch/arm/boot/dts/r8a7790.dtsi ->> =================================>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi +>> =================================================================== +>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi >> +++ renesas/arch/arm/boot/dts/r8a7790.dtsi >> @@ -626,6 +626,16 @@ >> status = "disabled"; diff --git a/a/content_digest b/N2/content_digest index b77ad20..1b5193c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,8 +3,18 @@ "ref\020150331002113.GB16289@verge.net.au\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH 2/2] ARM: shmobile: r8a7790: add EtherAVB DT support\0" - "Date\0Tue, 31 Mar 2015 15:04:43 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Tue, 31 Mar 2015 18:04:43 +0300\0" + "To\0Simon Horman <horms@verge.net.au>\0" + "Cc\0linux-sh@vger.kernel.org" + robh+dt@kernel.org + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + devicetree@vger.kernel.org + magnus.damm@gmail.com + linux@arm.linux.org.uk + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hello.\n" @@ -26,7 +36,8 @@ ">> 1 file changed, 10 insertions(+)\n" ">>\n" ">> Index: renesas/arch/arm/boot/dts/r8a7790.dtsi\n" - ">> =================================>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi\n" + ">> ===================================================================\n" + ">> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi\n" ">> +++ renesas/arch/arm/boot/dts/r8a7790.dtsi\n" ">> @@ -626,6 +626,16 @@\n" ">> \t\tstatus = \"disabled\";\n" @@ -42,4 +53,4 @@ "\n" WBR, Sergei -8f6fbafb5cf1fb68142ad141c965aa53ef9c21083b7cd7cfe366822b5b6fe6e9 +dd9c641dd6f3879afa397f94df4819f2b7c4f514a008bd5fc1b5723c7d07b702
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.