Merge branch 'linus' into x86/cleanups, to resolve conflict

Conflicts:
	arch/x86/kernel/kprobes/ftrace.c

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

diff --cc arch/x86/events/intel/core.c
Simple merge

diff --cc arch/x86/events/intel/ds.c
Simple merge

diff --cc arch/x86/include/asm/kvm_host.h
Simple merge

diff --cc arch/x86/include/asm/processor.h
Simple merge

diff --cc arch/x86/kernel/apic/apic.c
Simple merge

diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge

diff --cc arch/x86/kernel/signal.c
Simple merge

diff --cc arch/x86/kvm/mmu/mmu_internal.h
Simple merge

diff --cc arch/x86/kvm/mmu/tdp_mmu.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge