From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 4 Oct 2022 16:37:02 +0000 (-0700)
Subject: Merge tag 'x86_apic_for_v6.1_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.6.17~6514
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5bb3a16dbea8ac40a36056e8ca79d37d47198a67;p=platform%2Fkernel%2Flinux-rpi.git

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
---

5bb3a16dbea8ac40a36056e8ca79d37d47198a67