diff for duplicates of <20110119050844.GA8776@Krystal> diff --git a/a/1.txt b/N1/1.txt index bfdac4f..83dfcd7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -98,7 +98,8 @@ Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> 7 files changed, 25 insertions(+), 19 deletions(-) Index: linux-2.6-lttng/include/linux/compiler.h -=================================--- linux-2.6-lttng.orig/include/linux/compiler.h +=================================================================== +--- linux-2.6-lttng.orig/include/linux/compiler.h +++ linux-2.6-lttng/include/linux/compiler.h @@ -57,6 +57,8 @@ extern void __chk_io_ptr(const volatile # include <linux/compiler-intel.h> @@ -137,7 +138,8 @@ Index: linux-2.6-lttng/include/linux/compiler.h ______f = { \ .func = __func__, \ Index: linux-2.6-lttng/include/linux/syscalls.h -=================================--- linux-2.6-lttng.orig/include/linux/syscalls.h +=================================================================== +--- linux-2.6-lttng.orig/include/linux/syscalls.h +++ linux-2.6-lttng/include/linux/syscalls.h @@ -126,11 +126,13 @@ extern struct trace_event_functions exit @@ -192,7 +194,8 @@ Index: linux-2.6-lttng/include/linux/syscalls.h __syscall_meta__##sname = { \ .name = "sys_"#sname, \ Index: linux-2.6-lttng/include/trace/ftrace.h -=================================--- linux-2.6-lttng.orig/include/trace/ftrace.h +=================================================================== +--- linux-2.6-lttng.orig/include/trace/ftrace.h +++ linux-2.6-lttng/include/trace/ftrace.h @@ -79,7 +79,7 @@ #undef DEFINE_EVENT @@ -231,7 +234,8 @@ Index: linux-2.6-lttng/include/trace/ftrace.h .name = #call, \ .class = &event_class_##template, \ Index: linux-2.6-lttng/kernel/trace/trace.h -=================================--- linux-2.6-lttng.orig/kernel/trace/trace.h +=================================================================== +--- linux-2.6-lttng.orig/kernel/trace/trace.h +++ linux-2.6-lttng/kernel/trace/trace.h @@ -749,7 +749,7 @@ extern const char *__stop___trace_bprint #undef FTRACE_ENTRY @@ -243,7 +247,8 @@ Index: linux-2.6-lttng/kernel/trace/trace.h #define FTRACE_ENTRY_DUP(call, struct_name, id, tstruct, print) \ FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print)) Index: linux-2.6-lttng/kernel/trace/trace_export.c -=================================--- linux-2.6-lttng.orig/kernel/trace/trace_export.c +=================================================================== +--- linux-2.6-lttng.orig/kernel/trace/trace_export.c +++ linux-2.6-lttng/kernel/trace/trace_export.c @@ -156,7 +156,7 @@ struct ftrace_event_class event_class_ft }; \ @@ -255,7 +260,8 @@ Index: linux-2.6-lttng/kernel/trace/trace_export.c .name = #call, \ .event.type = etype, \ Index: linux-2.6-lttng/include/linux/ftrace_event.h -=================================--- linux-2.6-lttng.orig/include/linux/ftrace_event.h +=================================================================== +--- linux-2.6-lttng.orig/include/linux/ftrace_event.h +++ linux-2.6-lttng/include/linux/ftrace_event.h @@ -194,7 +194,7 @@ struct ftrace_event_call { int perf_refcount; @@ -267,7 +273,8 @@ Index: linux-2.6-lttng/include/linux/ftrace_event.h #define PERF_MAX_TRACE_SIZE 2048 Index: linux-2.6-lttng/include/trace/syscall.h -=================================--- linux-2.6-lttng.orig/include/trace/syscall.h +=================================================================== +--- linux-2.6-lttng.orig/include/trace/syscall.h +++ linux-2.6-lttng/include/trace/syscall.h @@ -29,7 +29,7 @@ struct syscall_metadata { diff --git a/a/content_digest b/N1/content_digest index 4f50809..989e167 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -9,8 +9,8 @@ "ref\020110118201323.GA14930@Krystal\0" "ref\01295382144.12215.123.camel@gandalf.stny.rr.com\0" "From\0Mathieu Desnoyers <mathieu.desnoyers@efficios.com>\0" - "Subject\0Re: Bug#609371: linux-image-2.6.37-trunk-sparc64: module scsi_mod:\0" - "Date\0Wed, 19 Jan 2011 05:08:45 +0000\0" + "Subject\0Re: Bug#609371: linux-image-2.6.37-trunk-sparc64: module scsi_mod: Unknown relocation: 36\0" + "Date\0Wed, 19 Jan 2011 00:08:45 -0500\0" "To\0Steven Rostedt <rostedt@goodmis.org>\0" "Cc\0David Miller <davem@davemloft.net>" richm@oldelvet.org.uk @@ -122,7 +122,8 @@ " 7 files changed, 25 insertions(+), 19 deletions(-)\n" "\n" "Index: linux-2.6-lttng/include/linux/compiler.h\n" - "=================================--- linux-2.6-lttng.orig/include/linux/compiler.h\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/include/linux/compiler.h\n" "+++ linux-2.6-lttng/include/linux/compiler.h\n" "@@ -57,6 +57,8 @@ extern void __chk_io_ptr(const volatile\n" " # include <linux/compiler-intel.h>\n" @@ -161,7 +162,8 @@ " \t\t\t______f = {\t\t\t\t\t\\\n" " \t\t\t\t.func = __func__,\t\t\t\\\n" "Index: linux-2.6-lttng/include/linux/syscalls.h\n" - "=================================--- linux-2.6-lttng.orig/include/linux/syscalls.h\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/include/linux/syscalls.h\n" "+++ linux-2.6-lttng/include/linux/syscalls.h\n" "@@ -126,11 +126,13 @@ extern struct trace_event_functions exit\n" " \n" @@ -216,7 +218,8 @@ " \t __syscall_meta__##sname = {\t\t\t\t\\\n" " \t\t.name \t\t= \"sys_\"#sname,\t\t\t\\\n" "Index: linux-2.6-lttng/include/trace/ftrace.h\n" - "=================================--- linux-2.6-lttng.orig/include/trace/ftrace.h\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/include/trace/ftrace.h\n" "+++ linux-2.6-lttng/include/trace/ftrace.h\n" "@@ -79,7 +79,7 @@\n" " #undef DEFINE_EVENT\n" @@ -255,7 +258,8 @@ " \t.name\t\t\t= #call,\t\t\t\t\\\n" " \t.class\t\t\t= &event_class_##template,\t\t\\\n" "Index: linux-2.6-lttng/kernel/trace/trace.h\n" - "=================================--- linux-2.6-lttng.orig/kernel/trace/trace.h\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/kernel/trace/trace.h\n" "+++ linux-2.6-lttng/kernel/trace/trace.h\n" "@@ -749,7 +749,7 @@ extern const char *__stop___trace_bprint\n" " #undef FTRACE_ENTRY\n" @@ -267,7 +271,8 @@ " #define FTRACE_ENTRY_DUP(call, struct_name, id, tstruct, print)\t\t\\\n" " \tFTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print))\n" "Index: linux-2.6-lttng/kernel/trace/trace_export.c\n" - "=================================--- linux-2.6-lttng.orig/kernel/trace/trace_export.c\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/kernel/trace/trace_export.c\n" "+++ linux-2.6-lttng/kernel/trace/trace_export.c\n" "@@ -156,7 +156,7 @@ struct ftrace_event_class event_class_ft\n" " };\t\t\t\t\t\t\t\t\t\\\n" @@ -279,7 +284,8 @@ " \t.name\t\t\t= #call,\t\t\t\t\\\n" " \t.event.type\t\t= etype,\t\t\t\t\\\n" "Index: linux-2.6-lttng/include/linux/ftrace_event.h\n" - "=================================--- linux-2.6-lttng.orig/include/linux/ftrace_event.h\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/include/linux/ftrace_event.h\n" "+++ linux-2.6-lttng/include/linux/ftrace_event.h\n" "@@ -194,7 +194,7 @@ struct ftrace_event_call {\n" " \tint\t\t\t\tperf_refcount;\n" @@ -291,7 +297,8 @@ " #define PERF_MAX_TRACE_SIZE\t2048\n" " \n" "Index: linux-2.6-lttng/include/trace/syscall.h\n" - "=================================--- linux-2.6-lttng.orig/include/trace/syscall.h\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/include/trace/syscall.h\n" "+++ linux-2.6-lttng/include/trace/syscall.h\n" "@@ -29,7 +29,7 @@ struct syscall_metadata {\n" " \n" @@ -309,4 +316,4 @@ "EfficiOS Inc.\n" http://www.efficios.com -8170225bdaa2c87c324442e4b728bfcacf0cef0eea83f73b570c4d02ac91f904 +8f71e4a5c4e6f7d5301233c0b8a796d532eabc171a73470154c38c4613ad183e
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.