From: Ingo Molnar Date: Sat, 2 Apr 2016 07:31:10 +0000 (+0200) Subject: Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming... X-Git-Tag: Ubuntu-5.10.0-12.13~12821^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f4d5b8adf3668a2fb69a411974057ec3b150b747;p=mirror_ubuntu-hirsute-kernel.git Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into efi/urgent Pull EFI/arm64 fix from Matt Fleming: " * Fix a boot crash on arm64 caused by a recent commit to mark the EFI memory map as 'MEMBLOCK_NOMAP' which causes the regions to be omitted from the kernel direct mapping - Ard Biesheuvel " Signed-off-by: Ingo Molnar --- f4d5b8adf3668a2fb69a411974057ec3b150b747