summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-29 02:00:50 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-29 02:00:50 +0100
commit26cd83670f2f5a3d5b5514a1f7d96567cdb9558b (patch)
tree9577207e3a3f48fe0bb88d38f046d4114bf03008 /tools
parentMerge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff)
parenttracing/dma-buf/fence: Fix timeline str value on fence_annotate_wait_on (diff)
downloadlinux-26cd83670f2f5a3d5b5514a1f7d96567cdb9558b.tar.xz
linux-26cd83670f2f5a3d5b5514a1f7d96567cdb9558b.zip
Merge tag 'trace-v4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull minor tracing fixes from Steven Rostedt: "This includes three minor fixes, mostly due to cut-and-paste issues. The first is a cut and paste issue that changed the amount of stack to skip when tracing a stack dump from 0 to 6, which basically made the stack disappear for small stack traces. The second fix is just removing an unused field in a struct that is no longer used, and currently just wastes space. The third is another cut-and-paste fix that had a tracepoint recording the wrong field (it was recording the previous field a second time)" * tag 'trace-v4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing/dma-buf/fence: Fix timeline str value on fence_annotate_wait_on ftrace: Remove unused nr_trampolines var tracing: Fix stacktrace skip depth in trace_buffer_unlock_commit_regs()
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions