diff for duplicates of <1403141433.4768.1.camel@concordia>
diff --git a/a/content_digest b/N1/content_digest
index 06c55f4..2706741 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -26,18 +26,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>",
@@ -46,12 +45,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"
]
[
@@ -108,4 +107,4 @@
"cheers"
]
-0c9111657ed46282c4ad1c3b2ade204068c5dbd3b5256e18782d1198274bdfbf
+6d0f1ad2bdbe7f5812eae47763f31f8354e1caa1b04f767d626cbc18c947a01b
diff --git a/a/1.txt b/N2/1.txt
index 7e38d31..fafda90 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -13,7 +13,7 @@ On Wed, 2014-06-18 at 17:46 +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 06c55f4..7ab51a0 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -17,10 +17,10 @@
"From\0Michael Ellerman <mpe\@ellerman.id.au>\0"
]
[
- "Subject\0Re: Re: [RFT PATCH -next v3] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc64\0"
+ "Subject\0Re: Re: [RFT PATCH -next v3] [BUGFIX] kprobes: Fix \"Failed to find blacklist\" error on ia64 and ppc6\0"
]
[
- "Date\0Thu, 19 Jun 2014 11:30:33 +1000\0"
+ "Date\0Thu, 19 Jun 2014 01:30:33 +0000\0"
]
[
"To\0Masami Hiramatsu <masami.hiramatsu.pt\@hitachi.com>\0"
@@ -76,7 +76,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",
@@ -108,4 +108,4 @@
"cheers"
]
-0c9111657ed46282c4ad1c3b2ade204068c5dbd3b5256e18782d1198274bdfbf
+0edaf3c871c9b4ea49e7ab64e0f2cf1d85d40503253e302994cdf83b7397decd
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.