projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
18b57ce
acb1872
)
Merge 4.18-rc7 into master to pick up the KVM dependcy
author
Thomas Gleixner
<tglx@linutronix.de>
Sun, 5 Aug 2018 14:39:29 +0000
(16:39 +0200)
committer
Thomas Gleixner
<tglx@linutronix.de>
Sun, 5 Aug 2018 14:39:29 +0000
(16:39 +0200)
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
16 files changed:
1
2
Documentation/admin-guide/kernel-parameters.txt
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/include/asm/pgtable.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/include/asm/pgtable_64.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/include/asm/vmx.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/kernel/cpu/amd.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/kernel/cpu/bugs.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/kernel/cpu/common.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/kernel/smpboot.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/kvm/mmu.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/kvm/vmx.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/kvm/x86.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/xen/enlighten.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/pci/controller/pci-hyperv.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/sched/core.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/sched/fair.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Documentation/admin-guide/kernel-parameters.txt
Simple merge
diff --cc
arch/x86/Kconfig
Simple merge
diff --cc
arch/x86/include/asm/pgtable.h
Simple merge
diff --cc
arch/x86/include/asm/pgtable_64.h
Simple merge
diff --cc
arch/x86/include/asm/vmx.h
Simple merge
diff --cc
arch/x86/kernel/cpu/amd.c
Simple merge
diff --cc
arch/x86/kernel/cpu/bugs.c
index
fa6123b
,
5c0ea39
..
eb4b574
---
1
/
arch/x86/kernel/cpu/bugs.c
---
2
/
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);
diff --cc
arch/x86/kernel/cpu/common.c
Simple merge
diff --cc
arch/x86/kernel/smpboot.c
Simple merge
diff --cc
arch/x86/kvm/mmu.c
Simple merge
diff --cc
arch/x86/kvm/vmx.c
Simple merge
diff --cc
arch/x86/kvm/x86.c
Simple merge
diff --cc
arch/x86/xen/enlighten.c
Simple merge
diff --cc
drivers/pci/controller/pci-hyperv.c
Simple merge
diff --cc
kernel/sched/core.c
Simple merge
diff --cc
kernel/sched/fair.c
Simple merge