All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <537151DA.8000101@cogentembedded.com>

diff --git a/a/1.txt b/N1/1.txt
index 28604db..a93ca0f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -15,7 +15,8 @@ On 05/12/2014 02:53 AM, Simon Horman wrote:
 >>>   1 file changed, 38 insertions(+)
 
 >>> Index: renesas/arch/arm/boot/dts/r8a7791-henninger.dts
->>> =================================>>> --- renesas.orig/arch/arm/boot/dts/r8a7791-henninger.dts
+>>> ===================================================================
+>>> --- renesas.orig/arch/arm/boot/dts/r8a7791-henninger.dts
 >>> +++ renesas/arch/arm/boot/dts/r8a7791-henninger.dts
 >> [...]
 >>> @@ -158,3 +163,36 @@
@@ -29,7 +30,7 @@ On 05/12/2014 02:53 AM, Simon Horman wrote:
 >>> +
 >>> +	status = "okay";
 >>> +
->>> +	flash@0 {
+>>> +	flash at 0 {
 >>> +		#address-cells = <1>;
 >>> +		#size-cells = <1>;
 >>> +		compatible = "spansion,s25fl512s";
@@ -39,12 +40,12 @@ On 05/12/2014 02:53 AM, Simon Horman wrote:
 >>> +		spi-rx-bus-width = <4>;
 >>> +		m25p,fast-read;
 >>> +
->>> +		partition@0 {
+>>> +		partition at 0 {
 >>> +			label = "loader_prg";
 >>> +			reg = <0x00000000 0x00040000>;
 >>> +			read-only;
 >>> +		};
->>> +		partition@40000 {
+>>> +		partition at 40000 {
 >>> +			label = "user_prg";
 >>> +			reg = <0x00040000 0x00400000>;
 >>> +			read-only;
diff --git a/a/content_digest b/N1/content_digest
index e33dd0a..149f3ea 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,9 @@
  "ref\0201405060245.32952.sergei.shtylyov@cogentembedded.com\0"
  "ref\0536FBEB7.9080605@cogentembedded.com\0"
  "ref\020140511225354.GC6451@verge.net.au\0"
- "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0"
- "Subject\0Re: [PATCH] ARM: shmobile: henninger: add QSPI DT support\0"
- "Date\0Mon, 12 May 2014 22:57:30 +0000\0"
+ "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0"
+ "Subject\0[PATCH] ARM: shmobile: henninger: add QSPI DT support\0"
+ "Date\0Tue, 13 May 2014 02:57:30 +0400\0"
  "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
@@ -24,7 +24,8 @@
  ">>>   1 file changed, 38 insertions(+)\n"
  "\n"
  ">>> Index: renesas/arch/arm/boot/dts/r8a7791-henninger.dts\n"
- ">>> =================================>>> --- renesas.orig/arch/arm/boot/dts/r8a7791-henninger.dts\n"
+ ">>> ===================================================================\n"
+ ">>> --- renesas.orig/arch/arm/boot/dts/r8a7791-henninger.dts\n"
  ">>> +++ renesas/arch/arm/boot/dts/r8a7791-henninger.dts\n"
  ">> [...]\n"
  ">>> @@ -158,3 +163,36 @@\n"
@@ -38,7 +39,7 @@
  ">>> +\n"
  ">>> +\tstatus = \"okay\";\n"
  ">>> +\n"
- ">>> +\tflash@0 {\n"
+ ">>> +\tflash at 0 {\n"
  ">>> +\t\t#address-cells = <1>;\n"
  ">>> +\t\t#size-cells = <1>;\n"
  ">>> +\t\tcompatible = \"spansion,s25fl512s\";\n"
@@ -48,12 +49,12 @@
  ">>> +\t\tspi-rx-bus-width = <4>;\n"
  ">>> +\t\tm25p,fast-read;\n"
  ">>> +\n"
- ">>> +\t\tpartition@0 {\n"
+ ">>> +\t\tpartition at 0 {\n"
  ">>> +\t\t\tlabel = \"loader_prg\";\n"
  ">>> +\t\t\treg = <0x00000000 0x00040000>;\n"
  ">>> +\t\t\tread-only;\n"
  ">>> +\t\t};\n"
- ">>> +\t\tpartition@40000 {\n"
+ ">>> +\t\tpartition at 40000 {\n"
  ">>> +\t\t\tlabel = \"user_prg\";\n"
  ">>> +\t\t\treg = <0x00040000 0x00400000>;\n"
  ">>> +\t\t\tread-only;\n"
@@ -69,4 +70,4 @@
  "\n"
  WBR, Sergei
 
-c5d0fffe5a85c8c09e9646f36090591833f8b38e0cda03400597b2b89082163d
+ed640fbf031ea1f424b1db8ec5291a34053f26d0c5280543ef93841a156e7ee5

diff --git a/a/1.txt b/N2/1.txt
index 28604db..bf0e364 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -15,7 +15,8 @@ On 05/12/2014 02:53 AM, Simon Horman wrote:
 >>>   1 file changed, 38 insertions(+)
 
 >>> Index: renesas/arch/arm/boot/dts/r8a7791-henninger.dts
->>> =================================>>> --- renesas.orig/arch/arm/boot/dts/r8a7791-henninger.dts
+>>> ===================================================================
+>>> --- renesas.orig/arch/arm/boot/dts/r8a7791-henninger.dts
 >>> +++ renesas/arch/arm/boot/dts/r8a7791-henninger.dts
 >> [...]
 >>> @@ -158,3 +163,36 @@
diff --git a/a/content_digest b/N2/content_digest
index e33dd0a..4068b45 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -3,8 +3,18 @@
  "ref\020140511225354.GC6451@verge.net.au\0"
  "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0"
  "Subject\0Re: [PATCH] ARM: shmobile: henninger: add QSPI DT support\0"
- "Date\0Mon, 12 May 2014 22:57:30 +0000\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "Date\0Tue, 13 May 2014 02:57:30 +0400\0"
+ "To\0Simon Horman <horms@verge.net.au>\0"
+ "Cc\0linux-sh@vger.kernel.org"
+  devicetree@vger.kernel.org
+  robh+dt@kernel.org
+  pawel.moll@arm.com
+  mark.rutland@arm.com
+  ijc+devicetree@hellion.org.uk
+  galak@codeaurora.org
+  magnus.damm@gmail.com
+  linux@arm.linux.org.uk
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hello.\n"
@@ -24,7 +34,8 @@
  ">>>   1 file changed, 38 insertions(+)\n"
  "\n"
  ">>> Index: renesas/arch/arm/boot/dts/r8a7791-henninger.dts\n"
- ">>> =================================>>> --- renesas.orig/arch/arm/boot/dts/r8a7791-henninger.dts\n"
+ ">>> ===================================================================\n"
+ ">>> --- renesas.orig/arch/arm/boot/dts/r8a7791-henninger.dts\n"
  ">>> +++ renesas/arch/arm/boot/dts/r8a7791-henninger.dts\n"
  ">> [...]\n"
  ">>> @@ -158,3 +163,36 @@\n"
@@ -69,4 +80,4 @@
  "\n"
  WBR, Sergei
 
-c5d0fffe5a85c8c09e9646f36090591833f8b38e0cda03400597b2b89082163d
+c9fac3f9a6d4e32ccfcca0c11bed4208313cd85a1b906dfd9cb372719fec029b

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.