diff for duplicates of <5458D0D1.9080403@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 4a32d9e..3a2dde6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,7 @@ On 11/4/2014 4:50 AM, Simon Horman wrote: Haven't you squashed 2 distinct patches by chance? > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> -> [horms+renesas@verge.net.au: resolved minor conflict] +> [horms+renesas at verge.net.au: resolved minor conflict] > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > arch/arm/boot/dts/r8a7790.dtsi | 90 ++++++++++++++++++++++++++++++++++++++++++ @@ -25,7 +25,7 @@ Haven't you squashed 2 distinct patches by chance? > status = "disabled"; > }; > -> + vsp1@fe920000 { +> + vsp1 at fe920000 { > + compatible = "renesas,vsp1"; > + reg = <0 0xfe920000 0 0x8000>; > + interrupts = <0 266 IRQ_TYPE_LEVEL_HIGH>; @@ -37,7 +37,7 @@ Haven't you squashed 2 distinct patches by chance? > + renesas,#wpf = <4>; > + }; > + -> + vsp1@fe928000 { +> + vsp1 at fe928000 { > + compatible = "renesas,vsp1"; > + reg = <0 0xfe928000 0 0x8000>; > + interrupts = <0 267 IRQ_TYPE_LEVEL_HIGH>; @@ -50,7 +50,7 @@ Haven't you squashed 2 distinct patches by chance? > + renesas,#wpf = <4>; > + }; > + -> + vsp1@fe930000 { +> + vsp1 at fe930000 { > + compatible = "renesas,vsp1"; > + reg = <0 0xfe930000 0 0x8000>; > + interrupts = <0 246 IRQ_TYPE_LEVEL_HIGH>; @@ -63,7 +63,7 @@ Haven't you squashed 2 distinct patches by chance? > + renesas,#wpf = <4>; > + }; > + -> + vsp1@fe938000 { +> + vsp1 at fe938000 { > + compatible = "renesas,vsp1"; > + reg = <0 0xfe938000 0 0x8000>; > + interrupts = <0 247 IRQ_TYPE_LEVEL_HIGH>; diff --git a/a/content_digest b/N1/content_digest index 7732ca7..ce8634b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\0cover.1415058552.git.horms+renesas@verge.net.au\0" "ref\03ac6a83c09cbb74ebb3d3e7e6e40e1ead3ff9d01.1415058552.git.horms+renesas@verge.net.au\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" - "Subject\0Re: [PATCH 03/10] ARM: shmobile: r8a7790: Add DU node to device tree\0" - "Date\0Tue, 04 Nov 2014 13:12:49 +0000\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" + "Subject\0[PATCH 03/10] ARM: shmobile: r8a7790: Add DU node to device tree\0" + "Date\0Tue, 04 Nov 2014 16:12:49 +0300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -19,7 +19,7 @@ "Haven't you squashed 2 distinct patches by chance?\n" "\n" "> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>\n" - "> [horms+renesas@verge.net.au: resolved minor conflict]\n" + "> [horms+renesas at verge.net.au: resolved minor conflict]\n" "> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>\n" "> ---\n" "> arch/arm/boot/dts/r8a7790.dtsi | 90 ++++++++++++++++++++++++++++++++++++++++++\n" @@ -33,7 +33,7 @@ "> \t\tstatus = \"disabled\";\n" "> \t};\n" ">\n" - "> +\tvsp1@fe920000 {\n" + "> +\tvsp1 at fe920000 {\n" "> +\t\tcompatible = \"renesas,vsp1\";\n" "> +\t\treg = <0 0xfe920000 0 0x8000>;\n" "> +\t\tinterrupts = <0 266 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -45,7 +45,7 @@ "> +\t\trenesas,#wpf = <4>;\n" "> +\t};\n" "> +\n" - "> +\tvsp1@fe928000 {\n" + "> +\tvsp1 at fe928000 {\n" "> +\t\tcompatible = \"renesas,vsp1\";\n" "> +\t\treg = <0 0xfe928000 0 0x8000>;\n" "> +\t\tinterrupts = <0 267 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -58,7 +58,7 @@ "> +\t\trenesas,#wpf = <4>;\n" "> +\t};\n" "> +\n" - "> +\tvsp1@fe930000 {\n" + "> +\tvsp1 at fe930000 {\n" "> +\t\tcompatible = \"renesas,vsp1\";\n" "> +\t\treg = <0 0xfe930000 0 0x8000>;\n" "> +\t\tinterrupts = <0 246 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -71,7 +71,7 @@ "> +\t\trenesas,#wpf = <4>;\n" "> +\t};\n" "> +\n" - "> +\tvsp1@fe938000 {\n" + "> +\tvsp1 at fe938000 {\n" "> +\t\tcompatible = \"renesas,vsp1\";\n" "> +\t\treg = <0 0xfe938000 0 0x8000>;\n" "> +\t\tinterrupts = <0 247 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -87,4 +87,4 @@ "\n" WBR, Sergei -89b0e07d4db9ec9521eeff7addfeedb4b4da9f80257ba19731ca41295ee32b08 +935379b8e5b8b125481047637242210ed766b3f1b1e7d5c9d80e0b9df3937d85
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.