Merge tag 'efi-urgent-2021-06-02' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Jun 2021 18:53:37 +0000 (08:53 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Jun 2021 18:53:37 +0000 (08:53 -1000)
commit324c92e5e0ee0e993bdb106fac407846ed677f6b
treea8f2cdbb25dd88bf327e5d9aa762eb88abaabd52
parent0372b6dd6cfef9db032e0ed83a6ddfb84d9920dc
parente169fba4f464760dd9734c9e39e1c2e88e374f32
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