Linus Torvalds
92b29b86fe
Merge branch 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (131 commits)
tracing/fastboot: improve help text
tracing/stacktrace: improve help text
tracing/fastboot: fix initcalls disposition in bootgraph.pl
tracing/fastboot: fix bootgraph.pl initcall name regexp
tracing/fastboot: fix issues and improve output of bootgraph.pl
tracepoints: synchronize unregister static inline
tracepoints: tracepoint_synchronize_unregister()
ftrace: make ftrace_test_p6nop disassembler-friendly
markers: fix synchronize marker unregister static inline
tracing/fastboot: add better resolution to initcall debug/tracing
trace: add build-time check to avoid overrunning hex buffer
ftrace: fix hex output mode of ftrace
tracing/fastboot: fix initcalls disposition in bootgraph.pl
tracing/fastboot: fix printk format typo in boot tracer
ftrace: return an error when setting a nonexistent tracer
ftrace: make some tracers reentrant
ring-buffer: make reentrant
ring-buffer: move page indexes into page headers
tracing/fastboot: only trace non-module initcalls
ftrace: move pc counter in irqtrace
...
Manually fix conflicts:
- init/main.c: initcall tracing
- kernel/module.c: verbose level vs tracepoints
- scripts/bootgraph.pl: fallout from cherry-picking commits.
2008-10-20 13:35:07 -07:00
..
2008-10-20 11:24:31 -07:00
2008-07-31 23:01:31 +02:00
2008-09-29 08:03:01 -07:00
2008-10-17 09:50:12 -07:00
2008-09-05 21:43:38 +10:00
2008-10-14 10:39:34 +02:00
2008-10-20 12:50:03 -07:00
2008-10-10 21:34:03 +02:00
2008-09-09 11:52:33 -07:00
2008-09-23 08:09:13 -07:00
2008-08-27 08:54:08 +10:00
2008-10-14 10:36:16 +02:00
2008-08-02 07:52:29 +01:00
2008-10-16 09:24:47 -07:00
2008-08-06 22:11:33 +02:00
2008-10-14 10:36:25 +02:00
2008-07-31 23:36:54 +02:00