]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit0a14503afe93a39c9f3b657f3d1cdae435592dfc
tree055ddec9479ec30cca661989b9902c13f52d533a
parent26f6d2aa726eb5da5b629a3f99f5fa14cba0153e
parent1ffff6c014f23e60c2db769cbe2ca9c5edcb691a
Merge branch 'upstream-x86-selftests' into WIP.x86/pti.base

Conflicts:
arch/x86/kernel/cpu/Makefile

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