git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git for-next
Head SHA1: 9f61668073a8d80650622e792aff876db9ca23c6 Daniel Wagner (1): tracing: Allow triggers to filter for CPU ids and process names Gil Fruchter (2): tracing: Prefer kcalloc over kzalloc with multiply tracing: Fix for non-continuous cpu ids Jungseok Lee (1): tracing: Introduce two additional marks for delay Minfei Huang (1): ftrace: Format MCOUNT_ADDR address as type unsigned long Steven Rostedt (Red Hat) (7): ring-buffer: Add event descriptor to simplify passing data ring-buffer: Move the adding of the extended timestamp out of line ring-buffer: Get timestamp after event is allocated ring-buffer: Make sure event has enough room for extend and padding ring-buffer: Reorganize function locations tracing: Clean up stack tracing and fix fentry updates ftrace: Fix function_graph duration spacing with 7-digits Umesh Tiwari (2): ftrace: correct the counter increment for trace_buffer data ftrace: add tracing_thresh to function profile ---- Documentation/trace/ftrace.txt | 51 ++- arch/metag/include/asm/ftrace.h | 2 +- arch/microblaze/include/asm/ftrace.h | 2 +- arch/powerpc/include/asm/ftrace.h | 2 +- arch/sh/include/asm/ftrace.h | 2 +- arch/sparc/include/asm/ftrace.h | 2 +- arch/x86/include/asm/ftrace.h | 4 +- kernel/trace/ftrace.c | 9 +- kernel/trace/ring_buffer.c | 864 +++++++++++++++++++---------------- kernel/trace/trace.c | 4 +- kernel/trace/trace_events.c | 25 + kernel/trace/trace_events_filter.c | 54 ++- kernel/trace/trace_functions_graph.c | 4 +- kernel/trace/trace_output.c | 4 +- kernel/trace/trace_stack.c | 68 +-- 15 files changed, 639 insertions(+), 458 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/