diff for duplicates of <1738124.5rApJWhXUN@avalon> diff --git a/a/1.txt b/N1/1.txt index 805423f..18fdf96 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,7 +10,8 @@ On Monday 02 September 2013 18:05:10 Sergei Shtylyov wrote: > >> 1 file changed, 11 insertions(+) > >> > >> Index: renesas/arch/arm/boot/dts/r8a7778.dtsi -> >> =================================> >> --- renesas.orig/arch/arm/boot/dts/r8a7778.dtsi +> >> =================================================================== +> >> --- renesas.orig/arch/arm/boot/dts/r8a7778.dtsi > >> +++ renesas/arch/arm/boot/dts/r8a7778.dtsi > >> @@ -98,4 +98,15 @@ > >> @@ -20,7 +21,7 @@ On Monday 02 September 2013 18:05:10 Sergei Shtylyov wrote: > >> }; > >> > >> + -> >> + ether: ethernet@fde00000 { +> >> + ether: ethernet at fde00000 { > >> + device_type = "network"; > > > > Documentation/devicetree/bindings/net/sh_eth.txt from "[PATCH 2/2] sh_eth: diff --git a/a/content_digest b/N1/content_digest index baaf47d..ce8fc41 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,10 @@ - "ref\087ehb8th3c.wl%kuninori.morimoto.gx@renesas.com\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH 1/4] ARM: shmobile: r8a7778: add Ether DT support\0" - "Date\0Mon, 02 Sep 2013 14:18:41 +0000\0" - "To\0linux-sh@vger.kernel.org\0" + "ref\0201309010311.05466.sergei.shtylyov@cogentembedded.com\0" + "ref\01643070.uIkONXsrBj@avalon\0" + "ref\052249B16.8010409@cogentembedded.com\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH 1/4] ARM: shmobile: r8a7778: add Ether DT support\0" + "Date\0Mon, 02 Sep 2013 16:18:41 +0200\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Monday 02 September 2013 18:05:10 Sergei Shtylyov wrote:\n" @@ -17,7 +19,8 @@ "> >> 1 file changed, 11 insertions(+)\n" "> >> \n" "> >> Index: renesas/arch/arm/boot/dts/r8a7778.dtsi\n" - "> >> =================================> >> --- renesas.orig/arch/arm/boot/dts/r8a7778.dtsi\n" + "> >> ===================================================================\n" + "> >> --- renesas.orig/arch/arm/boot/dts/r8a7778.dtsi\n" "> >> +++ renesas/arch/arm/boot/dts/r8a7778.dtsi\n" "> >> @@ -98,4 +98,15 @@\n" "> >> \n" @@ -27,7 +30,7 @@ "> >> \t};\n" "> >> \n" "> >> +\n" - "> >> +\tether: ethernet@fde00000 {\n" + "> >> +\tether: ethernet at fde00000 {\n" "> >> +\t\tdevice_type = \"network\";\n" "> > \n" "> > Documentation/devicetree/bindings/net/sh_eth.txt from \"[PATCH 2/2] sh_eth:\n" @@ -46,4 +49,4 @@ "\n" Laurent Pinchart -77b9cf9a7dc7462c629a99fc603bead626c49f4d9a47ab0532c6d1248a430d0e +f7b5e7ab80826066d80945cab353b314ba45e00a07af829d6df22b00cdf58b3a
diff --git a/a/1.txt b/N2/1.txt index 805423f..9dbc077 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -10,7 +10,8 @@ On Monday 02 September 2013 18:05:10 Sergei Shtylyov wrote: > >> 1 file changed, 11 insertions(+) > >> > >> Index: renesas/arch/arm/boot/dts/r8a7778.dtsi -> >> =================================> >> --- renesas.orig/arch/arm/boot/dts/r8a7778.dtsi +> >> =================================================================== +> >> --- renesas.orig/arch/arm/boot/dts/r8a7778.dtsi > >> +++ renesas/arch/arm/boot/dts/r8a7778.dtsi > >> @@ -98,4 +98,15 @@ > >> diff --git a/a/content_digest b/N2/content_digest index baaf47d..fba353c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,21 @@ - "ref\087ehb8th3c.wl%kuninori.morimoto.gx@renesas.com\0" + "ref\0201309010311.05466.sergei.shtylyov@cogentembedded.com\0" + "ref\01643070.uIkONXsrBj@avalon\0" + "ref\052249B16.8010409@cogentembedded.com\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH 1/4] ARM: shmobile: r8a7778: add Ether DT support\0" - "Date\0Mon, 02 Sep 2013 14:18:41 +0000\0" - "To\0linux-sh@vger.kernel.org\0" + "Date\0Mon, 02 Sep 2013 16:18:41 +0200\0" + "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "Cc\0horms@verge.net.au" + linux-sh@vger.kernel.org + rob.herring@calxeda.com + pawel.moll@arm.com + mark.rutland@arm.com + swarren@wwwdotorg.org + ian.campbell@citrix.com + 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 Monday 02 September 2013 18:05:10 Sergei Shtylyov wrote:\n" @@ -17,7 +30,8 @@ "> >> 1 file changed, 11 insertions(+)\n" "> >> \n" "> >> Index: renesas/arch/arm/boot/dts/r8a7778.dtsi\n" - "> >> =================================> >> --- renesas.orig/arch/arm/boot/dts/r8a7778.dtsi\n" + "> >> ===================================================================\n" + "> >> --- renesas.orig/arch/arm/boot/dts/r8a7778.dtsi\n" "> >> +++ renesas/arch/arm/boot/dts/r8a7778.dtsi\n" "> >> @@ -98,4 +98,15 @@\n" "> >> \n" @@ -46,4 +60,4 @@ "\n" Laurent Pinchart -77b9cf9a7dc7462c629a99fc603bead626c49f4d9a47ab0532c6d1248a430d0e +15056476adfc7b7eee8292f61b58c0ee52d8c86351c5f843435daae19a71db60
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.