Merge tag 'x86_apic_for_v6.1_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Oct 2022 16:37:02 +0000 (09:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Oct 2022 16:37:02 +0000 (09:37 -0700)
commit5bb3a16dbea8ac40a36056e8ca79d37d47198a67
tree8cf0cdb8954e25538265022ecb6f0cd711b6e164
parent51eaa866a50f3e5f006b0c4876ddfa0e5c72c5f0
parentb8d1d163604bd1e600b062fb00de5dc42baa355f
Merge tag 'x86_apic_for_v6.1_rc1' of git://git./linux/kernel/git/tip/tip

Pull x86 APIC update from Borislav Petkov:

 - Add support for locking the APIC in X2APIC mode to prevent SGX
   enclave leaks

* tag 'x86_apic_for_v6.1_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Don't disable x2APIC if locked
arch/x86/Kconfig