Merge branch 'tracing/urgent' into tracing/ftrace

diff --cc block/blk-core.c
Simple merge

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

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

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

diff --cc kernel/trace/trace.h
Simple merge

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