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-04-26 19:21:16 +02:00
2008-02-05 09:44:18 -08:00
2008-07-04 10:40:04 -07:00
2006-09-22 17:48:56 -07:00
2006-09-22 17:48:56 -07:00
2006-09-11 13:32:27 -04:00
2007-05-11 05:38:25 -04:00
2006-09-11 13:32:27 -04:00
2008-04-30 08:29:54 -07:00
2008-10-16 11:21:30 -07:00
2008-02-07 08:42:30 -08:00
2008-02-07 08:42:30 -08:00
2008-02-06 10:41:00 -08:00
2006-12-01 14:52:01 -08:00
2008-05-01 08:03:58 -07:00
2008-06-30 12:51:05 +02:00
2008-07-26 12:00:03 -07:00
2008-07-26 12:00:03 -07:00
2007-07-16 09:05:45 -07:00
2008-04-30 08:29:54 -07:00
2008-10-16 11:21:40 -07:00
2008-05-02 16:18:42 -07:00
2008-07-25 10:53:27 -07:00
2008-08-12 16:07:31 -07:00
2008-04-24 23:40:47 +02:00
2006-10-05 15:10:12 +01:00
2008-05-02 16:18:19 -07:00
2008-09-05 15:44:31 +01:00
2007-05-08 11:15:04 -07:00
2007-10-12 14:55:37 -04:00
2007-05-08 11:15:20 -07:00
2008-04-30 08:29:54 -07:00
2007-05-02 19:27:14 +02:00
2007-02-11 10:51:17 -08:00
2008-02-08 09:22:31 -08:00
2006-10-03 23:01:26 +02:00
2008-02-08 09:22:31 -08:00
2008-04-30 08:29:54 -07:00
2008-07-26 12:00:03 -07:00
2008-02-23 12:09:28 -08:00
2008-07-28 16:30:21 -07:00
2008-02-05 09:44:18 -08:00
2008-07-15 13:58:40 -07:00
2007-05-11 08:29:34 -07:00
2008-01-25 21:08:27 +01:00
2008-10-20 08:52:41 -07:00
2008-09-09 11:51:15 -07:00
2008-09-23 13:26:52 +02:00
2006-04-27 06:57:23 +01:00
2008-09-04 09:46:08 +01:00
2008-09-05 14:39:38 -07:00
2008-02-08 09:22:24 -08:00
2008-02-04 16:48:00 +01:00
2008-07-13 19:11:58 +02:00
2008-10-20 13:35:07 -07:00