diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-04-02 09:31:10 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-04-02 09:31:10 +0200 |
commit | f4d5b8adf3668a2fb69a411974057ec3b150b747 (patch) | |
tree | f98dcd2b5e955edbeb2f2ca19390bbda0eb06077 /fs/qnx6/inode.c | |
parent | Merge branch 'parisc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
parent | efi/arm64: Don't apply MEMBLOCK_NOMAP to UEFI memory map mapping (diff) | |
download | linux-f4d5b8adf3668a2fb69a411974057ec3b150b747.tar.xz linux-f4d5b8adf3668a2fb69a411974057ec3b150b747.zip |
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 <mingo@kernel.org>
Diffstat (limited to 'fs/qnx6/inode.c')
0 files changed, 0 insertions, 0 deletions