Merge branch 'linus' into perf/core

Reason: Further changes conflict with upstream fixes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc init/main.c
Simple merge

diff --cc kernel/sched.c
Simple merge

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

diff --cc tools/perf/builtin-record.c
Simple merge

diff --cc tools/perf/util/event.c
Simple merge

diff --cc tools/perf/util/newt.c
Simple merge

diff --cc tools/perf/util/session.c
Simple merge