Merge branch 'linus' into timers/core

Reason: Get upstream fixes before adding conflicting code.

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

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/platform/efi/efi.c
Simple merge

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

diff --cc kernel/hrtimer.c
Simple merge

diff --cc kernel/time/tick-broadcast.c
Simple merge