Merge branch 'x86/cleanups'

diff --cc arch/x86/boot/compressed/head_64.S
Simple merge

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

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

diff --cc arch/x86/entry/vdso/vdso32/system_call.S
Simple merge

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

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

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

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

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

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

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

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc arch/x86/lib/insn-eval.c
Simple merge

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

diff --cc arch/x86/mm/tlb.c
index f4b162f273f52ca0ca6f404f6c30920886dab7fd,98f269560d4060fb1f93ecfc968bccbe6a2574de..78804680e9231548ce8bfaf80bb51a970861afa8
--- 1/arch/x86/mm/tlb.c
--- 2/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@@ -907,10 -873,10 +907,10 @@@ static struct flush_tlb_info *get_flush
        return info;
  }
  
 -static inline void put_flush_tlb_info(void)
 +static void put_flush_tlb_info(void)
  {
  #ifdef CONFIG_DEBUG_VM
-       /* Complete reentrency prevention checks */
+       /* Complete reentrancy prevention checks */
        barrier();
        this_cpu_dec(flush_tlb_info_idx);
  #endif

diff --cc arch/x86/net/bpf_jit_comp.c
Simple merge

diff --cc arch/x86/platform/pvh/head.S
Simple merge

diff --cc arch/x86/power/cpu.c
Simple merge

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