Merge tag 'efi-urgent' into x86/efi
authorH. Peter Anvin <hpa@linux.intel.com>
Mon, 11 Aug 2014 20:58:54 +0000 (13:58 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Mon, 11 Aug 2014 20:58:54 +0000 (13:58 -0700)
commit9e13bcf7e0981f1db0c8c8255ac17d5f898903e9
tree2bb16d5bceab26b92ea68c2b895ce4a353d9338a
parentb16d8c231e4d03fefc7de1b8b62bad5659ee8070
parent7b2a583afb4ab894f78bc0f8bd136e96b6499a7e
Merge tag 'efi-urgent' into x86/efi

 * Enforce CONFIG_RELOCATABLE for the x86 EFI boot stub, otherwise
   it's possible to overwrite random pieces of unallocated memory during
   kernel decompression, leading to machine resets.

Resolved Conflicts:
arch/x86/Kconfig

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
arch/x86/Kconfig
arch/x86/boot/header.S
drivers/firmware/efi/efi.c
drivers/firmware/efi/libstub/fdt.c