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>

diff --cc arch/x86/Kconfig
index 7ea8aaa,a240977..842a5ab
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -1536,7 -1535,8 +1536,8 @@@ config EF
  
  config EFI_STUB
         bool "EFI stub support"
 -       depends on EFI
 +       depends on EFI && !X86_USE_3DNOW
+        select RELOCATABLE
         ---help---
            This kernel feature allows a bzImage to be loaded directly
          by EFI firmware without the use of a bootloader.

diff --cc arch/x86/boot/header.S
Simple merge

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

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