diff for duplicates of <1403078179.32307.7.camel@concordia>
diff --git a/a/content_digest b/N1/content_digest
index 0db4beb..04fca95 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -20,18 +20,17 @@
"To\0Masami Hiramatsu <masami.hiramatsu.pt\@hitachi.com>\0"
]
[
- "Cc\0Benjamin Herrenschmidt <benh\@kernel.crashing.org>",
- " Suzuki K. Poulose <suzuki\@in.ibm.com>",
- " Tony Luck <tony.luck\@gmail.com>",
- " Paul Mackerras <paulus\@samba.org>",
- " 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",
" anil.s.keshavamurthy\@intel.com",
" Ingo Molnar <mingo\@kernel.org>",
+ " Suzuki K. Poulose <suzuki\@in.ibm.com>",
" Fenghua Yu <fenghua.yu\@intel.com>",
" Arnd Bergmann <arnd\@arndb.de>",
" Rusty Russell <rusty\@rustcorp.com.au>",
@@ -40,12 +39,12 @@
" akataria\@vmware.com",
" Tony Luck <tony.luck\@intel.com>",
" Kevin Hao <haokexin\@gmail.com>",
- " Linus Torvalds <torvalds\@linux-foundation.org>",
+ " linuxppc-dev\@lists.ozlabs.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>",
- " linuxppc-dev\@lists.ozlabs.org",
+ " Linus Torvalds <torvalds\@linux-foundation.org>",
" David S. Miller <davem\@davemloft.net>\0"
]
[
@@ -84,4 +83,4 @@
"cheers"
]
-fe3bdf0b2709c66fdee883fffb449464599a552579f6f98d15c0742cb41627ea
+42824c4b0b545f09834ada911b5c095d656263a7bb8a034233659175da91ae65
diff --git a/a/1.txt b/N2/1.txt
index fa4cb70..ab0a4d3 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -11,7 +11,7 @@ On Fri, 2014-06-06 at 15:38 +0900, Masami Hiramatsu wrote:
> > unsigned long env;
> > } func_descr_t;
> >
-> > +#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 0db4beb..9c0d0ae 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -14,7 +14,7 @@
"Subject\0Re: [RFT PATCH -next v3] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0"
]
[
- "Date\0Wed, 18 Jun 2014 17:56:19 +1000\0"
+ "Date\0Wed, 18 Jun 2014 07:56:19 +0000\0"
]
[
"To\0Masami Hiramatsu <masami.hiramatsu.pt\@hitachi.com>\0"
@@ -68,7 +68,7 @@
"> > \tunsigned long env;\n",
"> > } func_descr_t;\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",
@@ -84,4 +84,4 @@
"cheers"
]
-fe3bdf0b2709c66fdee883fffb449464599a552579f6f98d15c0742cb41627ea
+fcdc4a5f7afc5e6c787e2ce70f1866b878475a74bfeeb41e304e0a57f5b5140a
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.