From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 Dec 2021 18:09:00 +0000 (-0800)
Subject: Merge tag 'efi-urgent-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.1-rc5~2489
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=55a677b256c363a0cdcd00781d392abeb6e1c0d1;p=platform%2Fkernel%2Flinux-starfive.git

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

55a677b256c363a0cdcd00781d392abeb6e1c0d1