All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <20140508061658.GA2384@in.ibm.com>

diff --git a/a/1.txt b/N1/1.txt
index 88b55bb..81b384a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,7 +4,7 @@ On Thu, May 08, 2014 at 02:40:00PM +0900, Masami Hiramatsu wrote:
 > > 
 > > ...
 > > 
-> >> +#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF = 1)
+> >> +#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF == 1)
 > >> +/*
 > >> + * On PPC64 ABIv1 the function pointer actually points to the
 > >> + * function's descriptor. The first entry in the descriptor is the
diff --git a/a/content_digest b/N1/content_digest
index 7e764ba..59e242c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,14 +4,13 @@
  "ref\0536B18B0.9060209@hitachi.com\0"
  "From\0Ananth N Mavinakayanahalli <ananth@in.ibm.com>\0"
  "Subject\0Re: [RFT PATCH -next ] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0"
- "Date\0Thu, 08 May 2014 06:28:58 +0000\0"
+ "Date\0Thu, 8 May 2014 11:46:58 +0530\0"
  "To\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0"
- "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>"
-  Paul Mackerras <paulus@samba.org>
-  Tony Luck <tony.luck@gmail.com>
-  Jeremy Fitzhardinge <jeremy@goop.org>
+ "Cc\0Jeremy Fitzhardinge <jeremy@goop.org>"
   linux-ia64@vger.kernel.org
   sparse@chrisli.org
+  Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
+  Paul Mackerras <paulus@samba.org>
   H. Peter Anvin <hpa@zytor.com>
   Thomas Gleixner <tglx@linutronix.de>
   linux-tip-commits@vger.kernel.org
@@ -25,12 +24,12 @@
   akataria@vmware.com
   Tony Luck <tony.luck@intel.com>
   Kevin Hao <haokexin@gmail.com>
-  linuxppc-dev@lists.ozlabs.org
+  Linus Torvalds <torvalds@linux-foundation.org>
   rdunlap@infradead.org
-  Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
+  Tony Luck <tony.luck@gmail.com>
   dl9pf@gmx.de
   Andrew Morton <akpm@linux-foundation.org>
-  Linus Torvalds <torvalds@linux-foundation.org>
+  linuxppc-dev@lists.ozlabs.org
  " David S. Miller <davem@davemloft.net>\0"
  "\00:1\0"
  "b\0"
@@ -40,7 +39,7 @@
  "> > \n"
  "> > ...\n"
  "> > \n"
- "> >> +#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF = 1)\n"
+ "> >> +#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF == 1)\n"
  "> >> +/*\n"
  "> >> + * On PPC64 ABIv1 the function pointer actually points to the\n"
  "> >> + * function's descriptor. The first entry in the descriptor is the\n"
@@ -76,4 +75,4 @@
  "\n"
  Ananth
 
-b4e87f90b263b2ef64b8acd910ad94be05ca760d3bbcc981fe85d05fd4280364
+a02762ee9fd03036e07d5df8094f828ac475829c9cc53a3fc23cf86496e59d46

diff --git a/a/1.txt b/N2/1.txt
index 88b55bb..81b384a 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -4,7 +4,7 @@ On Thu, May 08, 2014 at 02:40:00PM +0900, Masami Hiramatsu wrote:
 > > 
 > > ...
 > > 
-> >> +#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF = 1)
+> >> +#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF == 1)
 > >> +/*
 > >> + * On PPC64 ABIv1 the function pointer actually points to the
 > >> + * function's descriptor. The first entry in the descriptor is the
diff --git a/a/content_digest b/N2/content_digest
index 7e764ba..8830688 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -4,7 +4,7 @@
  "ref\0536B18B0.9060209@hitachi.com\0"
  "From\0Ananth N Mavinakayanahalli <ananth@in.ibm.com>\0"
  "Subject\0Re: [RFT PATCH -next ] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0"
- "Date\0Thu, 08 May 2014 06:28:58 +0000\0"
+ "Date\0Thu, 8 May 2014 11:46:58 +0530\0"
  "To\0Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>\0"
  "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>"
   Paul Mackerras <paulus@samba.org>
@@ -40,7 +40,7 @@
  "> > \n"
  "> > ...\n"
  "> > \n"
- "> >> +#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF = 1)\n"
+ "> >> +#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF == 1)\n"
  "> >> +/*\n"
  "> >> + * On PPC64 ABIv1 the function pointer actually points to the\n"
  "> >> + * function's descriptor. The first entry in the descriptor is the\n"
@@ -76,4 +76,4 @@
  "\n"
  Ananth
 
-b4e87f90b263b2ef64b8acd910ad94be05ca760d3bbcc981fe85d05fd4280364
+52af3f836fa449ac727b380b1fe4c6b07f74dbf0b3511163535b123e8358f4de

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.