Merge branch 'linus' into WIP.x86/boot, to fix up conflicts and to pick up updates

 Conflicts:
	arch/x86/xen/setup.c

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

diff --cc Documentation/x86/zero-page.txt
index 363dca7b446bd0fabbd5465f4bfe8e66151ff34b,b8527c6b76461c7ee9446630c5acb4cc65867671..97b7adbceda4828ab217301a305a3b20892d0603
--- 1/Documentation/x86/zero-page.txt
--- 2/Documentation/x86/zero-page.txt
+++ b/Documentation/x86/zero-page.txt
@@@ -31,8 -31,10 +31,10 @@@ Offset      Proto   Name            Meanin
  1E9/001       ALL     eddbuf_entries  Number of entries in eddbuf (below)
  1EA/001       ALL     edd_mbr_sig_buf_entries Number of entries in edd_mbr_sig_buffer
                                (below)
+ 1EB/001       ALL     kbd_status      Numlock is enabled
+ 1EC/001       ALL     secure_boot     Secure boot is enabled in the firmware
  1EF/001       ALL     sentinel        Used to detect broken bootloaders
  290/040       ALL     edd_mbr_sig_buffer EDD MBR signatures
 -2D0/A00       ALL     e820_map        E820 memory map table
 -                              (array of struct e820entry)
 +2D0/A00       ALL     e820_table      E820 memory map table
 +                              (array of struct e820_entry)
  D00/1EC       ALL     eddbuf          EDD data (array of struct edd_info)

diff --cc arch/x86/boot/compressed/eboot.c
Simple merge

diff --cc arch/x86/include/asm/pgtable.h
Simple merge

diff --cc arch/x86/include/uapi/asm/bootparam.h
Simple merge

diff --cc arch/x86/kernel/acpi/boot.c
index 873552718270f6abadb0928b0a8ae7f38bc56b21,ae32838cac5fd2251e1ffa0bbb8b8c629e399a84..a468f0fdc9075bbdc04d75f5105620c97d0ddf48
--- 1/arch/x86/kernel/acpi/boot.c
--- 2/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@@ -35,8 -35,8 +35,9 @@@
  #include <linux/bootmem.h>
  #include <linux/ioport.h>
  #include <linux/pci.h>
+ #include <linux/efi-bgrt.h>
  
 +#include <asm/e820/api.h>
  #include <asm/irqdomain.h>
  #include <asm/pci_x86.h>
  #include <asm/pgtable.h>

diff --cc arch/x86/kernel/apic/apic.c
Simple merge

diff --cc arch/x86/kernel/apic/x2apic_uv_x.c
Simple merge

diff --cc arch/x86/kernel/cpu/centaur.c
index 48d4ff2d9798a11fb69bbe1525ece139c2e508dc,2c234a6d94c4482e191b5feee3a12752f30d2c95..0e150d6dc64c42097b38401bde0fb927e126860c
--- 1/arch/x86/kernel/cpu/centaur.c
--- 2/arch/x86/kernel/cpu/centaur.c
+++ b/arch/x86/kernel/cpu/centaur.c
@@@ -1,8 -1,8 +1,8 @@@
- #include <linux/bitops.h>
- #include <linux/kernel.h>
+ 
+ #include <linux/sched.h>
  
  #include <asm/cpufeature.h>
 -#include <asm/e820.h>
 +#include <asm/e820/api.h>
  #include <asm/mtrr.h>
  #include <asm/msr.h>
  

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/mm/init_32.c
Simple merge

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc arch/x86/mm/pageattr.c
Simple merge

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

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

diff --cc arch/x86/xen/mmu.c
Simple merge