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-16 11:21:30 -07:00
2008-10-07 23:09:51 +01:00
2008-10-20 08:52:33 -07:00
2008-10-17 18:09:14 +02:00
2008-10-20 13:35:07 -07:00
2008-10-16 11:21:29 -07:00
2008-10-16 15:40:05 +02:00
2008-10-20 13:12:39 -07:00
2008-10-16 15:40:05 +02:00
2008-10-20 13:12:39 -07:00
2008-10-20 08:52:33 -07:00
2008-10-20 13:35:07 -07:00
2008-10-20 08:52:33 -07:00
2008-10-18 07:10:54 +10:00
2008-10-20 13:35:07 -07:00
2008-10-17 17:39:14 -03:00
2008-10-20 09:39:47 -07:00
2008-10-13 09:29:00 -04:00
2008-10-13 14:03:59 -07:00
2008-10-14 10:33:14 +02:00
2008-10-20 11:38:50 +09:00
2008-10-03 10:04:10 +02:00