Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into...

More EFI updates for v5.7

 - Incorporate a stable branch with the EFI pieces of Hans's work on
   loading device firmware from EFI boot service memory regions

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/platform/efi/efi.c
index aca9bdd,a4ea046..1aae530
--- 1/arch/x86/platform/efi/efi.c
--- 2/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@@ -901,8 -944,17 +902,9 @@@ static void __init __efi_enter_virtual_
                goto err;
        }
  
+       efi_check_for_embedded_firmwares();
        efi_free_boot_services();
  
 -      /*
 -       * Now that EFI is in virtual mode, update the function
 -       * pointers in the runtime service table to the new virtual addresses.
 -       *
 -       * Call EFI services through wrapper functions.
 -       */
 -      efi.runtime_version = efi_systab.hdr.revision;
 -
        if (!efi_is_mixed())
                efi_native_runtime_setup();
        else

diff --cc arch/x86/platform/efi/quirks.c
Simple merge

diff --cc drivers/firmware/efi/Makefile
Simple merge

diff --cc drivers/firmware/efi/efi.c
Simple merge

diff --cc include/linux/efi.h
Simple merge