All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <2360526.88foRQAOiM@wasted.cogentembedded.com>

diff --git a/a/1.txt b/N1/1.txt
index 31ceadf..fa14375 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -26,7 +26,8 @@ Changes in version 2:
  2 files changed, 52 insertions(+)
 
 Index: renesas/arch/arm/boot/dts/Makefile
-=================================--- renesas.orig/arch/arm/boot/dts/Makefile
+===================================================================
+--- renesas.orig/arch/arm/boot/dts/Makefile
 +++ renesas/arch/arm/boot/dts/Makefile
 @@ -515,6 +515,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
  	r8a7791-koelsch.dtb \
@@ -37,7 +38,8 @@ Index: renesas/arch/arm/boot/dts/Makefile
  dtb-$(CONFIG_ARCH_SOCFPGA) += \
  	socfpga_arria5_socdk.dtb \
 Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts
-=================================--- /dev/null
+===================================================================
+--- /dev/null
 +++ renesas/arch/arm/boot/dts/r8a7794-silk.dts
 @@ -0,0 +1,51 @@
 +/*
diff --git a/a/content_digest b/N1/content_digest
index 51a09c8..31eadf6 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,10 +8,22 @@
   "Subject\0[PATCH v3] ARM: shmobile: silk: initial device tree\0"
 ]
 [
-  "Date\0Tue, 28 Jul 2015 22:14:59 +0000\0"
+  "Date\0Wed, 29 Jul 2015 01:14:59 +0300\0"
 ]
 [
-  "To\0linux-arm-kernel\@lists.infradead.org\0"
+  "To\0horms\@verge.net.au",
+  " linux-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\0"
+]
+[
+  "Cc\0magnus.damm\@gmail.com",
+  " linux\@arm.linux.org.uk",
+  " linux-arm-kernel\@lists.infradead.org\0"
 ]
 [
   "\0000:1\0"
@@ -48,7 +60,8 @@
   " 2 files changed, 52 insertions(+)\n",
   "\n",
   "Index: renesas/arch/arm/boot/dts/Makefile\n",
-  "=================================--- renesas.orig/arch/arm/boot/dts/Makefile\n",
+  "===================================================================\n",
+  "--- renesas.orig/arch/arm/boot/dts/Makefile\n",
   "+++ renesas/arch/arm/boot/dts/Makefile\n",
   "\@\@ -515,6 +515,7 \@\@ dtb-\$(CONFIG_ARCH_SHMOBILE_MULTI) += \\\n",
   " \tr8a7791-koelsch.dtb \\\n",
@@ -59,7 +72,8 @@
   " dtb-\$(CONFIG_ARCH_SOCFPGA) += \\\n",
   " \tsocfpga_arria5_socdk.dtb \\\n",
   "Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts\n",
-  "=================================--- /dev/null\n",
+  "===================================================================\n",
+  "--- /dev/null\n",
   "+++ renesas/arch/arm/boot/dts/r8a7794-silk.dts\n",
   "\@\@ -0,0 +1,51 \@\@\n",
   "+/*\n",
@@ -115,4 +129,4 @@
   "+};"
 ]
 
-bc92d4f0babefe475eed08bd7ac31ccbd62632c328f057105a6db7e89379096e
+6f79799fbcd1765fcaf0393be84ed7bca9b87d9829757bc8cc01d5250bd60d21

diff --git a/a/1.txt b/N2/1.txt
index 31ceadf..59bf877 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -26,7 +26,8 @@ Changes in version 2:
  2 files changed, 52 insertions(+)
 
 Index: renesas/arch/arm/boot/dts/Makefile
-=================================--- renesas.orig/arch/arm/boot/dts/Makefile
+===================================================================
+--- renesas.orig/arch/arm/boot/dts/Makefile
 +++ renesas/arch/arm/boot/dts/Makefile
 @@ -515,6 +515,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
  	r8a7791-koelsch.dtb \
@@ -37,7 +38,8 @@ Index: renesas/arch/arm/boot/dts/Makefile
  dtb-$(CONFIG_ARCH_SOCFPGA) += \
  	socfpga_arria5_socdk.dtb \
 Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts
-=================================--- /dev/null
+===================================================================
+--- /dev/null
 +++ renesas/arch/arm/boot/dts/r8a7794-silk.dts
 @@ -0,0 +1,51 @@
 +/*
@@ -68,7 +70,7 @@ Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts
 +		stdout-path = &scif2;
 +	};
 +
-+	memory@40000000 {
++	memory at 40000000 {
 +		device_type = "memory";
 +		reg = <0 0x40000000 0 0x40000000>;
 +	};
diff --git a/a/content_digest b/N2/content_digest
index 51a09c8..081b952 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,13 +2,13 @@
   "ref\000201404250239.39150.sergei.shtylyov\@cogentembedded.com\0"
 ]
 [
-  "From\0Sergei Shtylyov <sergei.shtylyov\@cogentembedded.com>\0"
+  "From\0sergei.shtylyov\@cogentembedded.com (Sergei Shtylyov)\0"
 ]
 [
   "Subject\0[PATCH v3] ARM: shmobile: silk: initial device tree\0"
 ]
 [
-  "Date\0Tue, 28 Jul 2015 22:14:59 +0000\0"
+  "Date\0Wed, 29 Jul 2015 01:14:59 +0300\0"
 ]
 [
   "To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -48,7 +48,8 @@
   " 2 files changed, 52 insertions(+)\n",
   "\n",
   "Index: renesas/arch/arm/boot/dts/Makefile\n",
-  "=================================--- renesas.orig/arch/arm/boot/dts/Makefile\n",
+  "===================================================================\n",
+  "--- renesas.orig/arch/arm/boot/dts/Makefile\n",
   "+++ renesas/arch/arm/boot/dts/Makefile\n",
   "\@\@ -515,6 +515,7 \@\@ dtb-\$(CONFIG_ARCH_SHMOBILE_MULTI) += \\\n",
   " \tr8a7791-koelsch.dtb \\\n",
@@ -59,7 +60,8 @@
   " dtb-\$(CONFIG_ARCH_SOCFPGA) += \\\n",
   " \tsocfpga_arria5_socdk.dtb \\\n",
   "Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts\n",
-  "=================================--- /dev/null\n",
+  "===================================================================\n",
+  "--- /dev/null\n",
   "+++ renesas/arch/arm/boot/dts/r8a7794-silk.dts\n",
   "\@\@ -0,0 +1,51 \@\@\n",
   "+/*\n",
@@ -90,7 +92,7 @@
   "+\t\tstdout-path = &scif2;\n",
   "+\t};\n",
   "+\n",
-  "+\tmemory\@40000000 {\n",
+  "+\tmemory at 40000000 {\n",
   "+\t\tdevice_type = \"memory\";\n",
   "+\t\treg = <0 0x40000000 0 0x40000000>;\n",
   "+\t};\n",
@@ -115,4 +117,4 @@
   "+};"
 ]
 
-bc92d4f0babefe475eed08bd7ac31ccbd62632c328f057105a6db7e89379096e
+36a3796f45495beee3af147d32a6ee0de4c681fae40069aa0170ada7851eb275
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.