From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 17 Dec 2017 12:04:28 +0000 (+0100)
Subject: Merge branch 'upstream-x86-selftests' into WIP.x86/pti.base
X-Git-Tag: v4.15-rc4~2^2~9
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=650400b2ccb8542ff4e2677d66ff083d01c7bd6a;p=linux-2.6-block.git

Merge branch 'upstream-x86-selftests' into WIP.x86/pti.base

Conflicts:
	arch/x86/kernel/cpu/Makefile

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

650400b2ccb8542ff4e2677d66ff083d01c7bd6a