]> 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)
commitddfd434d62e734dffdeca7e5c8ba6ef4f720504e
tree055ddec9479ec30cca661989b9902c13f52d533a
parent9f24cd69cdb7165a4fc4dba8bcfbc2bdede1705b
parent2c75e51d5cd35fa6eca28c80614f06772e52a9c5
Merge branch 'upstream-x86-selftests' into WIP.x86/pti.base

Conflicts:
arch/x86/kernel/cpu/Makefile

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