From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 1 Mar 2017 08:02:26 +0000 (+0100)
Subject: Merge branch 'linus' into WIP.x86/boot, to fix up conflicts and to pick up updates
X-Git-Tag: v4.12-rc1~150^2~5^2~1
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=0871d5a66da5c41151e0896a90298b163e42f2e0

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>
---

0871d5a66da5c41151e0896a90298b163e42f2e0
diff --cc Documentation/x86/zero-page.txt
index 363dca7b446b,b8527c6b7646..97b7adbceda4
--- a/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/kernel/acpi/boot.c
index 873552718270,ae32838cac5f..a468f0fdc907
--- a/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/cpu/centaur.c
index 48d4ff2d9798,2c234a6d94c4..0e150d6dc64c
--- a/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>