Merge branch 'x86/pti-urgent' into x86/pti
authorThomas Gleixner <tglx@linutronix.de>
Mon, 6 Aug 2018 18:56:34 +0000 (20:56 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 6 Aug 2018 18:56:34 +0000 (20:56 +0200)
commit315706049c343794ad0d3e5b6f6b60b900457b11
tree0a1596a4b5843a6262d17b4c656715854784977d
parent706d51681d636a0c4a5ef53395ec3b803e45ed4d
parentc40a56a7818cfe735fc93a69e1875f8bba834483
Merge branch 'x86/pti-urgent' into x86/pti

Integrate the PTI Global bit fixes which conflict with the 32bit PTI
support.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/mm/init_64.c
arch/x86/mm/pti.c