Merge branch 'linus' into locking/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/entry/entry_64.S
Simple merge

diff --cc drivers/clocksource/arm_arch_timer.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_debugfs.c
Simple merge

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

diff --cc lib/Kconfig.debug
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/udp.c
Simple merge

diff --cc scripts/Makefile.build
Simple merge