diff for duplicates of <54E635E6.1010409@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 523038f..cd31869 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,13 +11,14 @@ On 02/19/2015 08:55 PM, Simon Horman wrote: >>>> 1 file changed, 11 insertions(+) >>>> Index: renesas/arch/arm/boot/dts/r8a7794.dtsi ->>>> =================================>>>> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi +>>>> =================================================================== +>>>> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi >>>> +++ renesas/arch/arm/boot/dts/r8a7794.dtsi >>>> @@ -346,6 +346,17 @@ >>>> status = "disabled"; >>>> }; >>>> ->>>> + mmcif0: mmc@ee200000 { +>>>> + mmcif0: mmc at ee200000 { >>>> + compatible = "renesas,mmcif-r8a7794", "renesas,sh-mmcif"; >>> Please submit a patch to add "renesas,mmcif-r8a7794" to diff --git a/a/content_digest b/N1/content_digest index 3cdccab..9a25d34 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,9 +3,9 @@ "ref\020150219161012.GA3864@verge.net.au\0" "ref\054E61740.8030708@cogentembedded.com\0" "ref\020150219175458.GA18262@verge.net.au\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" - "Subject\0Re: [PATCH 1/2] ARM: shmobile: r8a7794: add MMCIF DT support\0" - "Date\0Thu, 19 Feb 2015 19:13:42 +0000\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" + "Subject\0[PATCH 1/2] ARM: shmobile: r8a7794: add MMCIF DT support\0" + "Date\0Thu, 19 Feb 2015 22:13:42 +0300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -22,13 +22,14 @@ ">>>> 1 file changed, 11 insertions(+)\n" "\n" ">>>> Index: renesas/arch/arm/boot/dts/r8a7794.dtsi\n" - ">>>> =================================>>>> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi\n" + ">>>> ===================================================================\n" + ">>>> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi\n" ">>>> +++ renesas/arch/arm/boot/dts/r8a7794.dtsi\n" ">>>> @@ -346,6 +346,17 @@\n" ">>>> \t\tstatus = \"disabled\";\n" ">>>> \t};\n" ">>>>\n" - ">>>> +\tmmcif0: mmc@ee200000 {\n" + ">>>> +\tmmcif0: mmc at ee200000 {\n" ">>>> +\t\tcompatible = \"renesas,mmcif-r8a7794\", \"renesas,sh-mmcif\";\n" "\n" ">>> Please submit a patch to add \"renesas,mmcif-r8a7794\" to\n" @@ -65,4 +66,4 @@ "\n" WBR, Sergei -c415bdde3669bcd996630a665350e7895097eb906dd608e1d0aa3a297ab414fe +43fbdff65329d5ece900a908eb49b832e3a2c0fc81ba7754e65f27bbd351e72b
diff --git a/a/1.txt b/N2/1.txt index 523038f..b6804c8 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -11,7 +11,8 @@ On 02/19/2015 08:55 PM, Simon Horman wrote: >>>> 1 file changed, 11 insertions(+) >>>> Index: renesas/arch/arm/boot/dts/r8a7794.dtsi ->>>> =================================>>>> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi +>>>> =================================================================== +>>>> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi >>>> +++ renesas/arch/arm/boot/dts/r8a7794.dtsi >>>> @@ -346,6 +346,17 @@ >>>> status = "disabled"; diff --git a/a/content_digest b/N2/content_digest index 3cdccab..4b5e219 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,8 +5,18 @@ "ref\020150219175458.GA18262@verge.net.au\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH 1/2] ARM: shmobile: r8a7794: add MMCIF DT support\0" - "Date\0Thu, 19 Feb 2015 19:13:42 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 19 Feb 2015 22:13:42 +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" "On 02/19/2015 08:55 PM, Simon Horman wrote:\n" @@ -22,7 +32,8 @@ ">>>> 1 file changed, 11 insertions(+)\n" "\n" ">>>> Index: renesas/arch/arm/boot/dts/r8a7794.dtsi\n" - ">>>> =================================>>>> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi\n" + ">>>> ===================================================================\n" + ">>>> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi\n" ">>>> +++ renesas/arch/arm/boot/dts/r8a7794.dtsi\n" ">>>> @@ -346,6 +346,17 @@\n" ">>>> \t\tstatus = \"disabled\";\n" @@ -65,4 +76,4 @@ "\n" WBR, Sergei -c415bdde3669bcd996630a665350e7895097eb906dd608e1d0aa3a297ab414fe +643fc8981d002e5ebf3b4b265eae47879238df1ea293b7e2ae7e11b04bd43e9d
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.