]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit3eec9c066fadf888d0ad5c67f49315e56636b1c4
tree0a1596a4b5843a6262d17b4c656715854784977d
parent57e891d8551946175a813ec7f4183696a27ada5f
parentf8fd2b493cfd3db5bd386399b81ea79d26b550b4
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