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-09-16 10:01:30 -05:00
2008-04-02 20:44:56 -05:00
2008-10-02 13:08:02 -04:00
2008-10-08 11:36:57 -06:00
2008-10-15 11:31:54 +11:00
2008-10-13 11:09:58 -05:00
2008-10-13 11:09:58 -05:00
2008-10-13 11:10:00 -05:00
2008-10-13 11:09:58 -05:00
2008-10-20 13:35:07 -07:00
2008-10-15 11:31:54 +11:00
2008-09-29 09:23:06 -05:00
2008-09-15 11:08:35 -07:00
2008-10-15 11:31:54 +11:00
2008-10-09 09:45:04 -07:00
2008-10-15 11:31:54 +11:00
2007-03-22 10:07:32 -05:00
2008-09-24 16:26:43 -05:00
2008-10-15 11:31:54 +11:00
2008-10-02 00:58:49 -05:00
2008-10-13 11:09:58 -05:00
2008-10-16 15:17:40 -07:00
2008-08-04 13:18:17 +10:00