Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 'tracing...

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/process.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/trace/ring_buffer.c
Simple merge

diff --cc kernel/trace/trace_sysprof.c
index 4e2de4de1d6530a5396d628aed8f84207b0a85d1,84ca9d81e74dfd18136c3b5d99c910c50666e43a,9902c15997ad8b295ac8106849e837ba491d9bb6,eaca5ad803fffe755767acd073a36564aa620d22..7c9a2d82a7d83702a1a0eaebd6d2b29fee66d6c3
--- 1/kernel/trace/trace_sysprof.c
--- 2/kernel/trace/trace_sysprof.c
--- 3/kernel/trace/trace_sysprof.c
--- 4/kernel/trace/trace_sysprof.c
+++ b/kernel/trace/trace_sysprof.c
@@@@@ -238,10 -238,10 -238,12 -247,7 +238,12 @@@@@ static int stack_trace_init(struct trac
    {
        sysprof_trace = tr;
    
   -    start_stack_trace(tr);
++ +    tracing_start_cmdline_record();
++ +
   +    mutex_lock(&sample_timer_lock);
   +    start_stack_timers();
   +    tracer_enabled = 1;
   +    mutex_unlock(&sample_timer_lock);
        return 0;
    }
    

diff --cc mm/slab.c
Simple merge

diff --cc mm/slob.c
Simple merge

diff --cc mm/slub.c
Simple merge