diff for duplicates of <20120906081704.GA362@in.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 9c0b507..4cee88f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -44,7 +44,8 @@ Fix the namespace clash by making opcode_t in probes.h to ppc_opcode_t. Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com> --- Index: linux-tip-22aug/arch/powerpc/include/asm/probes.h -=================================--- linux-tip-22aug.orig/arch/powerpc/include/asm/probes.h 2012-09-04 20:00:19.747069793 +0530 +=================================================================== +--- linux-tip-22aug.orig/arch/powerpc/include/asm/probes.h 2012-09-04 20:00:19.747069793 +0530 +++ linux-tip-22aug/arch/powerpc/include/asm/probes.h 2012-09-04 20:42:08.147286718 +0530 @@ -22,7 +22,7 @@ */ @@ -56,7 +57,8 @@ Index: linux-tip-22aug/arch/powerpc/include/asm/probes.h /* Trap definitions per ISA */ Index: linux-tip-22aug/arch/powerpc/include/asm/uprobes.h -=================================--- linux-tip-22aug.orig/arch/powerpc/include/asm/uprobes.h 2012-09-04 20:01:30.617071747 +0530 +=================================================================== +--- linux-tip-22aug.orig/arch/powerpc/include/asm/uprobes.h 2012-09-04 20:01:30.617071747 +0530 +++ linux-tip-22aug/arch/powerpc/include/asm/uprobes.h 2012-09-04 20:42:26.657287349 +0530 @@ -25,7 +25,7 @@ #include <linux/notifier.h> @@ -68,7 +70,8 @@ Index: linux-tip-22aug/arch/powerpc/include/asm/uprobes.h #define MAX_UINSN_BYTES 4 #define UPROBE_XOL_SLOT_BYTES (MAX_UINSN_BYTES) Index: linux-tip-22aug/arch/powerpc/include/asm/kprobes.h -=================================--- linux-tip-22aug.orig/arch/powerpc/include/asm/kprobes.h 2012-09-04 20:00:19.747069793 +0530 +=================================================================== +--- linux-tip-22aug.orig/arch/powerpc/include/asm/kprobes.h 2012-09-04 20:00:19.747069793 +0530 +++ linux-tip-22aug/arch/powerpc/include/asm/kprobes.h 2012-09-04 20:42:15.557286955 +0530 @@ -36,7 +36,7 @@ struct pt_regs; diff --git a/a/content_digest b/N1/content_digest index 1665a2c..fe1597c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01346900172.19098.17.camel@pasglop\0" "From\0Ananth N Mavinakayanahalli <ananth@in.ibm.com>\0" "Subject\0[PATCH] Rename opcode_t in probes.h to ppc_opcode_t\0" - "Date\0Thu, 06 Sep 2012 08:29:04 +0000\0" + "Date\0Thu, 6 Sep 2012 13:47:04 +0530\0" "To\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" " Stephen Rothwell <sfr@canb.auug.org.au>\0" "Cc\0linuxppc-dev@lists.ozlabs.org" @@ -58,7 +58,8 @@ "Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>\n" "---\n" "Index: linux-tip-22aug/arch/powerpc/include/asm/probes.h\n" - "=================================--- linux-tip-22aug.orig/arch/powerpc/include/asm/probes.h\t2012-09-04 20:00:19.747069793 +0530\n" + "===================================================================\n" + "--- linux-tip-22aug.orig/arch/powerpc/include/asm/probes.h\t2012-09-04 20:00:19.747069793 +0530\n" "+++ linux-tip-22aug/arch/powerpc/include/asm/probes.h\t2012-09-04 20:42:08.147286718 +0530\n" "@@ -22,7 +22,7 @@\n" " */\n" @@ -70,7 +71,8 @@ " \n" " /* Trap definitions per ISA */\n" "Index: linux-tip-22aug/arch/powerpc/include/asm/uprobes.h\n" - "=================================--- linux-tip-22aug.orig/arch/powerpc/include/asm/uprobes.h\t2012-09-04 20:01:30.617071747 +0530\n" + "===================================================================\n" + "--- linux-tip-22aug.orig/arch/powerpc/include/asm/uprobes.h\t2012-09-04 20:01:30.617071747 +0530\n" "+++ linux-tip-22aug/arch/powerpc/include/asm/uprobes.h\t2012-09-04 20:42:26.657287349 +0530\n" "@@ -25,7 +25,7 @@\n" " #include <linux/notifier.h>\n" @@ -82,7 +84,8 @@ " #define MAX_UINSN_BYTES\t\t4\n" " #define UPROBE_XOL_SLOT_BYTES\t(MAX_UINSN_BYTES)\n" "Index: linux-tip-22aug/arch/powerpc/include/asm/kprobes.h\n" - "=================================--- linux-tip-22aug.orig/arch/powerpc/include/asm/kprobes.h\t2012-09-04 20:00:19.747069793 +0530\n" + "===================================================================\n" + "--- linux-tip-22aug.orig/arch/powerpc/include/asm/kprobes.h\t2012-09-04 20:00:19.747069793 +0530\n" "+++ linux-tip-22aug/arch/powerpc/include/asm/kprobes.h\t2012-09-04 20:42:15.557286955 +0530\n" "@@ -36,7 +36,7 @@\n" " struct pt_regs;\n" @@ -94,4 +97,4 @@ " \n" #ifdef CONFIG_PPC64 -391bb45ba7f44b75ecab60844a19fd4987972a8675588e5ac8c5621347581321 +8e2feaacd350cadd65c27a2ed7dbb5c2527af1ffc6661a129a2fe8d9592b004d
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.