]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'v4.15' into x86/pti, to be able to merge dependent changes
authorIngo Molnar <mingo@kernel.org>
Tue, 30 Jan 2018 14:08:27 +0000 (15:08 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 30 Jan 2018 14:08:27 +0000 (15:08 +0100)
commit7e86548e2cc8d308cb75439480f428137151b0de
treefa3bcdedb64f4642a21080bc2b4ddc69ce2b2285
parent64e16720ea0879f8ab4547e3b9758936d483909b
parentd8a5b80568a9cb66810e75b182018e9edb68e8ff
Merge tag 'v4.15' into x86/pti, to be able to merge dependent changes

Time has come to switch PTI development over to a v4.15 base - we'll still
try to make sure that all PTI fixes backport cleanly to v4.14 and earlier.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
13 files changed:
arch/x86/entry/entry_64.S
arch/x86/include/asm/disabled-features.h
arch/x86/include/asm/msr-index.h
arch/x86/include/asm/processor.h
arch/x86/kernel/alternative.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/intel.c
arch/x86/kvm/emulate.c
arch/x86/kvm/vmx.c
arch/x86/lib/Makefile
include/linux/module.h
kernel/module.c
scripts/mod/modpost.c