Merge tag 'x86-cleanups-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel...

Pull x86 cleanups from Thomas Gleixner:
 "A set of small x86 cleanups:

   - Remove unused headers in the IDT code

   - Kconfig indendation and comment fixes

   - Fix all 'the the' typos in one go instead of waiting for bots to
     fix one at a time"

* tag 'x86-cleanups-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Fix all occurences of the "the the" typo
  x86/idt: Remove unused headers
  x86/Kconfig: Fix indentation of arch/x86/Kconfig.debug
  x86/Kconfig: Fix indentation and add endif comments to arch/x86/Kconfig

diff --cc arch/x86/Kconfig
index e0498b2e9b79cc5425576269e5829ab7834e2a10,4d610ae216ceec83dfc983d62fd71d91e2cfeda8..7df2a9ef3662dd4b2ca3c181c0cb405dc3a76582
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -2868,10 -2858,14 +2866,9 @@@ config COMPA
        def_bool y
        depends on IA32_EMULATION || X86_X32_ABI
  
--if COMPAT
  config COMPAT_FOR_U64_ALIGNMENT
        def_bool y
- endif
 -
 -config SYSVIPC_COMPAT
 -      def_bool y
 -      depends on SYSVIPC
 -endif # COMPAT
++      depends on COMPAT
  
  endmenu
  

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

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