Merge tag 'efi-urgent-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Dec 2021 18:09:00 +0000 (10:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Dec 2021 18:09:00 +0000 (10:09 -0800)
commit55a677b256c363a0cdcd00781d392abeb6e1c0d1
treef6ac439e9c019b331e4fa9695a8276b01b712b28
parent0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1
parent1ff2fc02862d52e18fd3daabcfe840ec27e920a8
Merge tag 'efi-urgent-for-v5.16' of git://git./linux/kernel/git/efi/efi

Pull EFI fix from Ard Biesheuvel:
 "Ensure that the EFI memory map resides in encrypted memory even after
  it has been reallocated"

* tag 'efi-urgent-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  x86/sme: Explicitly map new EFI memmap table as encrypted
arch/x86/Kconfig