]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 Apr 2009 18:04:19 +0000 (11:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 Apr 2009 18:04:19 +0000 (11:04 -0700)
commit714f83d5d9f7c785f622259dad1f4fad12d64664
tree20563541ae438e11d686b4d629074eb002a481b7
parent8901e7ffc2fa78ede7ce9826dbad68a3a25dc2dc
parent645dae969c3b8651c5bc7c54a1835ec03820f85f
Merge branch 'tracing-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits)
  tracing, net: fix net tree and tracing tree merge interaction
  tracing, powerpc: fix powerpc tree and tracing tree interaction
  ring-buffer: do not remove reader page from list on ring buffer free
  function-graph: allow unregistering twice
  trace: make argument 'mem' of trace_seq_putmem() const
  tracing: add missing 'extern' keywords to trace_output.h
  tracing: provide trace_seq_reserve()
  blktrace: print out BLK_TN_MESSAGE properly
  blktrace: extract duplidate code
  blktrace: fix memory leak when freeing struct blk_io_trace
  blktrace: fix blk_probes_ref chaos
  blktrace: make classic output more classic
  blktrace: fix off-by-one bug
  blktrace: fix the original blktrace
  blktrace: fix a race when creating blk_tree_root in debugfs
  blktrace: fix timestamp in binary output
  tracing, Text Edit Lock: cleanup
  tracing: filter fix for TRACE_EVENT_FORMAT events
  ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release()
  x86: kretprobe-booster interrupt emulation code fix
  ...

Fix up trivial conflicts in
 arch/parisc/include/asm/ftrace.h
 include/linux/memory.h
 kernel/extable.c
 kernel/module.c
21 files changed:
Documentation/kernel-parameters.txt
MAINTAINERS
arch/ia64/kernel/Makefile
arch/ia64/kernel/entry.S
arch/x86/Kconfig
arch/x86/kernel/process.c
arch/x86/kernel/ptrace.c
include/linux/kernel.h
include/linux/memory.h
include/linux/module.h
include/linux/sched.h
include/linux/syscalls.h
init/Kconfig
kernel/extable.c
kernel/module.c
kernel/relay.c
kernel/sched.c
kernel/softirq.c
kernel/trace/Kconfig
kernel/workqueue.c
mm/slab.c