Merge branch 'upstream-x86-selftests' into WIP.x86/pti.base
authorIngo Molnar <mingo@kernel.org>
Sun, 17 Dec 2017 12:04:28 +0000 (13:04 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 17 Dec 2017 12:04:28 +0000 (13:04 +0100)
commit650400b2ccb8542ff4e2677d66ff083d01c7bd6a
tree055ddec9479ec30cca661989b9902c13f52d533a
parent0fd2e9c53d82704a3ba87ea1980ec515188c5316
parentfec8f5ae1715a01c72ad52cb2ecd8aacaf142302
Merge branch 'upstream-x86-selftests' into WIP.x86/pti.base

Conflicts:
arch/x86/kernel/cpu/Makefile

Signed-off-by: Ingo Molnar <mingo@kernel.org>