From: Thomas Gleixner <tglx@linutronix.de>
Date: Sun, 5 Aug 2018 14:39:29 +0000 (+0200)
Subject: Merge 4.18-rc7 into master to pick up the KVM dependcy
X-Git-Tag: for-linus-20180825~123^2~11
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f2701b77bbd992f3df4631de8493f21db0830452;p=linux-block.git

Merge 4.18-rc7 into master to pick up the KVM dependcy

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

f2701b77bbd992f3df4631de8493f21db0830452
diff --cc arch/x86/kernel/cpu/bugs.c
index fa6123bdd032,5c0ea39311fe..eb4b574be237
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@@ -28,7 -27,7 +28,8 @@@
  #include <asm/pgtable.h>
  #include <asm/set_memory.h>
  #include <asm/intel-family.h>
 +#include <asm/e820/api.h>
+ #include <asm/hypervisor.h>
  
  static void __init spectre_v2_select_mitigation(void);
  static void __init ssb_select_mitigation(void);