Merge branch 'linus' into tracing/core

Merge reason: merge latest tracing fixes to avoid conflicts in
              kernel/trace/trace_events_filter.c with upcoming change

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc kernel/trace/Kconfig
Simple merge

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

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

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