Merge branch 'core/speculation' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorWill Deacon <will.deacon@arm.com>
Fri, 26 Apr 2019 12:32:20 +0000 (13:32 +0100)
committerWill Deacon <will.deacon@arm.com>
Fri, 26 Apr 2019 12:32:20 +0000 (13:32 +0100)
Pull in core support for the "mitigations=" cmdline option from Thomas
Gleixner via -tip, which we can build on top of when we expose our
mitigation state via sysfs.

1  2 
Documentation/admin-guide/kernel-parameters.txt
arch/powerpc/kernel/security.c
arch/powerpc/kernel/setup_64.c
arch/x86/kernel/cpu/bugs.c
arch/x86/mm/pti.c
kernel/cpu.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/cpu.c
Simple merge