diff for duplicates of <53B59208.703@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index a0f3ae5..ac070a4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,13 +11,14 @@ On 07/03/2014 02:43 AM, Sergei Shtylyov wrote: > 1 file changed, 16 insertions(+) > 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 > @@ -518,6 +518,22 @@ > status = "disabled"; > }; > -> + can0: can@e6e80000 { +> + can0: can at e6e80000 { > + compatible = "renesas,rcar-can"; Oops, this ain't gonna fly with the current CAN driver patch... :-( diff --git a/a/content_digest b/N1/content_digest index 4defc6d..38f2e56 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\0201407030239.15921.sergei.shtylyov@cogentembedded.com\0" "ref\0201407030243.25237.sergei.shtylyov@cogentembedded.com\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" - "Subject\0Re: [PATCH 1/2] ARM: shmobile: r8a7791: add CAN DT support\0" - "Date\0Thu, 03 Jul 2014 17:25:28 +0000\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" + "Subject\0[PATCH 1/2] ARM: shmobile: r8a7791: add CAN DT support\0" + "Date\0Thu, 03 Jul 2014 21:25:28 +0400\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -19,13 +19,14 @@ "> 1 file changed, 16 insertions(+)\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" "> @@ -518,6 +518,22 @@\n" "> \t\tstatus = \"disabled\";\n" "> \t};\n" ">\n" - "> +\tcan0: can@e6e80000 {\n" + "> +\tcan0: can at e6e80000 {\n" "> +\t\tcompatible = \"renesas,rcar-can\";\n" "\n" " Oops, this ain't gonna fly with the current CAN driver patch... :-(\n" @@ -33,4 +34,4 @@ "\n" WBR, Sergei -cb206efc9d31384523f25ea45b4ca8d803ec4904b8f5665314649f839e1bd92f +2de36edd14cad27b45f210901f740b060a7bcf05ec191517deda281955e6079c
diff --git a/a/1.txt b/N2/1.txt index a0f3ae5..4acf216 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -11,7 +11,8 @@ On 07/03/2014 02:43 AM, Sergei Shtylyov wrote: > 1 file changed, 16 insertions(+) > 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 > @@ -518,6 +518,22 @@ > status = "disabled"; diff --git a/a/content_digest b/N2/content_digest index 4defc6d..9ec3082 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,18 @@ "ref\0201407030243.25237.sergei.shtylyov@cogentembedded.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH 1/2] ARM: shmobile: r8a7791: add CAN DT support\0" - "Date\0Thu, 03 Jul 2014 17:25:28 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 03 Jul 2014 21:25:28 +0400\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" "Hello.\n" @@ -19,7 +29,8 @@ "> 1 file changed, 16 insertions(+)\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" "> @@ -518,6 +518,22 @@\n" "> \t\tstatus = \"disabled\";\n" @@ -33,4 +44,4 @@ "\n" WBR, Sergei -cb206efc9d31384523f25ea45b4ca8d803ec4904b8f5665314649f839e1bd92f +0365b247cb71900f769760cfd16d6f4ef86bf27562546ac861dbcab5cbf9c1ee
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.