From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 14 Mar 2021 19:54:56 +0000 (-0700)
Subject: Merge tag 'efi-urgent-for-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~1540
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=836d7f0572ca42ac85d649235680479740743ac6;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'efi-urgent-for-v5.12-rc2' of git://git./linux/kernel/git/tip/tip

Pull EFI fix from Ard Biesheuvel via Borislav Petkov:
 "Fix an oversight in the handling of EFI_RT_PROPERTIES_TABLE, which was
  added v5.10, but failed to take the SetVirtualAddressMap() RT service
  into account"

* tag 'efi-urgent-for-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi: stub: omit SetVirtualAddressMap() if marked unsupported in RT_PROP table
---

836d7f0572ca42ac85d649235680479740743ac6