From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Jun 2021 18:53:37 +0000 (-1000)
Subject: Merge tag 'efi-urgent-2021-06-02' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~1027
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=324c92e5e0ee0e993bdb106fac407846ed677f6b;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'efi-urgent-2021-06-02' of git://git./linux/kernel/git/tip/tip

Pull EFI fixes from Ingo Molnar:
 "A handful of EFI fixes:

   - Fix/robustify a diagnostic printk

   - Fix a (normally not triggered) parser bug in the libstub code

   - Allow !EFI_MEMORY_XP && !EFI_MEMORY_RO entries in the memory map

   - Stop RISC-V from crashing on boot if there's no FDT table"

* tag 'efi-urgent-2021-06-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi: cper: fix snprintf() use in cper_dimm_err_location()
  efi/libstub: prevent read overflow in find_file_option()
  efi: Allow EFI_MEMORY_XP and EFI_MEMORY_RO both to be cleared
  efi/fdt: fix panic when no valid fdt found
---

324c92e5e0ee0e993bdb106fac407846ed677f6b