All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <2679079.Rucv1O0jLA@avalon>

diff --git a/a/1.txt b/N1/1.txt
index 678d54e..c2fa85c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -12,7 +12,8 @@ On Friday 07 February 2014 01:14:26 Sergei Shtylyov wrote:
 >  1 file changed, 30 insertions(+), 1 deletion(-)
 > 
 > Index: renesas/arch/arm/boot/dts/r8a7791-koelsch.dts
-> =================================> --- renesas.orig/arch/arm/boot/dts/r8a7791-koelsch.dts
+> ===================================================================
+> --- renesas.orig/arch/arm/boot/dts/r8a7791-koelsch.dts
 > +++ renesas/arch/arm/boot/dts/r8a7791-koelsch.dts
 > @@ -2,7 +2,8 @@
 >   * Device Tree Source for the Koelsch board
@@ -52,7 +53,7 @@ On Friday 07 February 2014 01:14:26 Sergei Shtylyov wrote:
 > +	renesas,ether-link-active-low;
 > +	status = "ok";
 > +
-> +	phy1: ethernet-phy@1 {
+> +	phy1: ethernet-phy at 1 {
 > +		reg = <1>;
 > +		interrupt-parent = <&irqc0>;
 > +		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
diff --git a/a/content_digest b/N1/content_digest
index baa3a02..f31ad8f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,8 @@
  "ref\0201402070110.18561.sergei.shtylyov@cogentembedded.com\0"
  "ref\0201402070114.27279.sergei.shtylyov@cogentembedded.com\0"
- "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0"
- "Subject\0Re: [PATCH 2/2] ARM: shmobile: koelsch: add Ether DT support\0"
- "Date\0Tue, 11 Feb 2014 17:01:25 +0000\0"
+ "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0"
+ "Subject\0[PATCH 2/2] ARM: shmobile: koelsch: add Ether DT support\0"
+ "Date\0Tue, 11 Feb 2014 18:01:25 +0100\0"
  "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
@@ -20,7 +20,8 @@
  ">  1 file changed, 30 insertions(+), 1 deletion(-)\n"
  "> \n"
  "> Index: renesas/arch/arm/boot/dts/r8a7791-koelsch.dts\n"
- "> =================================> --- renesas.orig/arch/arm/boot/dts/r8a7791-koelsch.dts\n"
+ "> ===================================================================\n"
+ "> --- renesas.orig/arch/arm/boot/dts/r8a7791-koelsch.dts\n"
  "> +++ renesas/arch/arm/boot/dts/r8a7791-koelsch.dts\n"
  "> @@ -2,7 +2,8 @@\n"
  ">   * Device Tree Source for the Koelsch board\n"
@@ -60,7 +61,7 @@
  "> +\trenesas,ether-link-active-low;\n"
  "> +\tstatus = \"ok\";\n"
  "> +\n"
- "> +\tphy1: ethernet-phy@1 {\n"
+ "> +\tphy1: ethernet-phy at 1 {\n"
  "> +\t\treg = <1>;\n"
  "> +\t\tinterrupt-parent = <&irqc0>;\n"
  "> +\t\tinterrupts = <0 IRQ_TYPE_LEVEL_LOW>;\n"
@@ -92,4 +93,4 @@
  "\n"
  Laurent Pinchart
 
-a8923748f2f82843fed0abe1ef24b350228fff832c00e2e4b23ad3a62dcb0396
+b3754bbb6a5a76b3ed0f42eaacb998b61ee45a2284eb0057d3a8f78fbf74b3cc

diff --git a/a/1.txt b/N2/1.txt
index 678d54e..11a1c56 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -12,7 +12,8 @@ On Friday 07 February 2014 01:14:26 Sergei Shtylyov wrote:
 >  1 file changed, 30 insertions(+), 1 deletion(-)
 > 
 > Index: renesas/arch/arm/boot/dts/r8a7791-koelsch.dts
-> =================================> --- renesas.orig/arch/arm/boot/dts/r8a7791-koelsch.dts
+> ===================================================================
+> --- renesas.orig/arch/arm/boot/dts/r8a7791-koelsch.dts
 > +++ renesas/arch/arm/boot/dts/r8a7791-koelsch.dts
 > @@ -2,7 +2,8 @@
 >   * Device Tree Source for the Koelsch board
diff --git a/a/content_digest b/N2/content_digest
index baa3a02..c58c8f8 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,8 +2,19 @@
  "ref\0201402070114.27279.sergei.shtylyov@cogentembedded.com\0"
  "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0"
  "Subject\0Re: [PATCH 2/2] ARM: shmobile: koelsch: add Ether DT support\0"
- "Date\0Tue, 11 Feb 2014 17:01:25 +0000\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "Date\0Tue, 11 Feb 2014 18:01:25 +0100\0"
+ "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0"
+ "Cc\0horms@verge.net.au"
+  robh+dt@kernel.org
+  pawel.moll@arm.com
+  mark.rutland@arm.com
+  ijc+devicetree@hellion.org.uk
+  galak@codeaurora.org
+  linux-sh@vger.kernel.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"
  "Hi Sergei,\n"
@@ -20,7 +31,8 @@
  ">  1 file changed, 30 insertions(+), 1 deletion(-)\n"
  "> \n"
  "> Index: renesas/arch/arm/boot/dts/r8a7791-koelsch.dts\n"
- "> =================================> --- renesas.orig/arch/arm/boot/dts/r8a7791-koelsch.dts\n"
+ "> ===================================================================\n"
+ "> --- renesas.orig/arch/arm/boot/dts/r8a7791-koelsch.dts\n"
  "> +++ renesas/arch/arm/boot/dts/r8a7791-koelsch.dts\n"
  "> @@ -2,7 +2,8 @@\n"
  ">   * Device Tree Source for the Koelsch board\n"
@@ -92,4 +104,4 @@
  "\n"
  Laurent Pinchart
 
-a8923748f2f82843fed0abe1ef24b350228fff832c00e2e4b23ad3a62dcb0396
+32c969df6c8bda95d5b071a5e7282c7a1191539995fc9746b1f3587f76b101cd

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.