projects / platform / kernel / linux-3.10.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7006957 d28daf9)
Merge commit 'tracing/core' into tracing/kprobes
authorFrederic Weisbecker <fweisbec@gmail.com>
Thu, 10 Sep 2009 23:09:23 +0000 (01:09 +0200)
committerFrederic Weisbecker <fweisbec@gmail.com>
Thu, 10 Sep 2009 23:09:23 +0000 (01:09 +0200)
commit8f8ffe2485bcaa890800681451d380779cea06af
tree1d2ef3a27f1cab9a2b9014f4b75886a96a1ae8dbtree | snapshot
parent70069577323e6f72b845166724f34b9858134437commit | diff
parentd28daf923ac5e4a0d7cecebae56f3e339189366bcommit | diff
Merge commit 'tracing/core' into tracing/kprobes

Conflicts:
kernel/trace/trace_export.c
kernel/trace/trace_kprobe.c

Merge reason: This topic branch lacks an important
build fix in tracing/core:

0dd7b74787eaf7858c6c573353a83c3e2766e674:
tracing: Fix double CPP substitution in TRACE_EVENT_FN

that prevents from multiple tracepoint headers inclusion crashes.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
include/linux/ftrace_event.h diff1 | diff2 | blob | history
include/linux/syscalls.h diff1 | diff2 | blob | history
include/trace/ftrace.h diff1 | diff2 | blob | history
kernel/trace/Kconfig diff1 | diff2 | blob | history
kernel/trace/trace.h diff1 | diff2 | blob | history
kernel/trace/trace_events.c diff1 | diff2 | blob | history
kernel/trace/trace_export.c diff1 | diff2 | blob | history
kernel/trace/trace_kprobe.c diff1 | | blob | history
kernel/trace/trace_syscalls.c diff1 | diff2 | blob | history
Domain: System / Kernel;