Merge branch 'linus' into timers/core

Make sure the upstream fixes are applied before adding further
modifications.

diff --cc arch/x86/kernel/cpu/perf_event_intel_rapl.c
Simple merge

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

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/locking/rtmutex.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge