Merge branch 'linus' into x86/asm, to pick up fixes and resolve conflicts

Conflicts:
	arch/x86/kernel/cpu/Makefile

Signed-off-by: Ingo Molnar <[email protected]>

diff --cc Makefile
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/Kconfig.debug
Simple merge

diff --cc arch/x86/entry/calling.h
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/cpu/Makefile
index de260fae1017d52fc597d59376d46e8fe068b7aa,236999c54edce69820fcf372a918db9899a5eef5..570e8bb1f386d918487ca0a01991b9e5f0052d9e
--- 1/arch/x86/kernel/cpu/Makefile
--- 2/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@@ -21,8 -22,7 +22,8 @@@ obj-y                 += common.
  obj-y                 += rdrand.o
  obj-y                 += match.o
  obj-y                 += bugs.o
- obj-$(CONFIG_CPU_FREQ)        += aperfmperf.o
+ obj-y                 += aperfmperf.o
 +obj-y                 += cpuid-deps.o
  
  obj-$(CONFIG_PROC_FS) += proc.o
  obj-$(CONFIG_X86_FEATURE_NAMES) += capflags.o powerflags.o

diff --cc arch/x86/kernel/head_32.S
Simple merge

diff --cc arch/x86/kernel/head_64.S
Simple merge

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

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

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

diff --cc arch/x86/mm/fault.c
Simple merge

diff --cc arch/x86/mm/kasan_init_64.c
Simple merge

diff --cc arch/x86/xen/enlighten_pv.c
Simple merge

diff --cc arch/x86/xen/smp_pv.c
Simple merge

diff --cc arch/x86/xen/xen-asm_64.S
Simple merge

diff --cc arch/x86/xen/xen-head.S
Simple merge

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

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

diff --cc mm/sparse.c
Simple merge

diff --cc scripts/Makefile.build
Simple merge