Merge branch 'for-next/kpti' into for-next/core
authorWill Deacon <will@kernel.org>
Mon, 25 Jul 2022 09:56:49 +0000 (10:56 +0100)
committerWill Deacon <will@kernel.org>
Mon, 25 Jul 2022 09:56:49 +0000 (10:56 +0100)
* for-next/kpti:
  arm64: correct the effect of mitigations off on kpti
  arm64: entry: simplify trampoline data page
  arm64: mm: install KPTI nG mappings with MMU enabled
  arm64: kpti-ng: simplify page table traversal logic

1  2 
arch/arm64/kernel/cpufeature.c

Simple merge