diff for duplicates of <6826396.5PIZbPW8q4@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 94f19db..ec588fe 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,7 +16,8 @@ to compile. 1 file changed, 27 insertions(+), 1 deletion(-) Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts -=================================--- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts +=================================================================== +--- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts +++ renesas/arch/arm/boot/dts/r8a7794-silk.dts @@ -22,7 +22,7 @@ }; @@ -57,7 +58,7 @@ Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts + renesas,ether-link-active-low; + status = "okay"; + -+ phy1: ethernet-phy@1 { ++ phy1: ethernet-phy at 1 { + reg = <1>; + interrupt-parent = <&irqc0>; + interrupts = <8 IRQ_TYPE_LEVEL_LOW>; diff --git a/a/content_digest b/N1/content_digest index 6ea08ed..bb96cde 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0201404250239.39150.sergei.shtylyov@cogentembedded.com\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" "Subject\0[PATCH RESEND] ARM: shmobile: silk: add Ether DT support\0" - "Date\0Tue, 28 Jul 2015 22:16:02 +0000\0" + "Date\0Wed, 29 Jul 2015 01:16:02 +0300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -23,7 +23,8 @@ " 1 file changed, 27 insertions(+), 1 deletion(-)\n" "\n" "Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts\n" - "=================================--- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts\n" + "===================================================================\n" + "--- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts\n" "+++ renesas/arch/arm/boot/dts/r8a7794-silk.dts\n" "@@ -22,7 +22,7 @@\n" " \t};\n" @@ -64,7 +65,7 @@ "+\trenesas,ether-link-active-low;\n" "+\tstatus = \"okay\";\n" "+\n" - "+\tphy1: ethernet-phy@1 {\n" + "+\tphy1: ethernet-phy at 1 {\n" "+\t\treg = <1>;\n" "+\t\tinterrupt-parent = <&irqc0>;\n" "+\t\tinterrupts = <8 IRQ_TYPE_LEVEL_LOW>;\n" @@ -72,4 +73,4 @@ "+\t};\n" +}; -2de55014c5240d566a24d6ab94d626782703716754a4796672f46f47b0fd1058 +6f1f0ab81b31a2308c9e3da160c94a2c42c9917ac4d322bec0ec586dd3b69a71
diff --git a/a/1.txt b/N2/1.txt index 94f19db..e5cb143 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -16,7 +16,8 @@ to compile. 1 file changed, 27 insertions(+), 1 deletion(-) Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts -=================================--- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts +=================================================================== +--- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts +++ renesas/arch/arm/boot/dts/r8a7794-silk.dts @@ -22,7 +22,7 @@ }; diff --git a/a/content_digest b/N2/content_digest index 6ea08ed..82e5a92 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,18 @@ "ref\0201404250239.39150.sergei.shtylyov@cogentembedded.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH RESEND] ARM: shmobile: silk: add Ether DT support\0" - "Date\0Tue, 28 Jul 2015 22:16:02 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 29 Jul 2015 01:16:02 +0300\0" + "To\0horms@verge.net.au" + linux-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\0" + "Cc\0magnus.damm@gmail.com" + linux@arm.linux.org.uk + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Define the SILK board dependent part of the Ether device node.\n" @@ -23,7 +33,8 @@ " 1 file changed, 27 insertions(+), 1 deletion(-)\n" "\n" "Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts\n" - "=================================--- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts\n" + "===================================================================\n" + "--- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts\n" "+++ renesas/arch/arm/boot/dts/r8a7794-silk.dts\n" "@@ -22,7 +22,7 @@\n" " \t};\n" @@ -72,4 +83,4 @@ "+\t};\n" +}; -2de55014c5240d566a24d6ab94d626782703716754a4796672f46f47b0fd1058 +2da5e56f04ab7f1445c8df5153658ceccaac7251c8a76a0a68c1d00dd8e35433
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.