Merge branch 'for-next/cpufeature' into for-next/core
authorWill Deacon <will@kernel.org>
Thu, 4 Jan 2024 12:26:56 +0000 (12:26 +0000)
committerWill Deacon <will@kernel.org>
Thu, 4 Jan 2024 12:26:56 +0000 (12:26 +0000)
commit3f35db4e68ceb84aad9f3ae0ae0a13779ada5b5c
tree7e201f6332d5c11452e34e23c054544d18a50644
parent2cc14f52aeb78ce3f29677c2de1f06c0e91471ab
parenteb15d707c252c3fb56e3ea57a185976c67e5a07f
Merge branch 'for-next/cpufeature' into for-next/core

* for-next/cpufeature:
  arm64: Align boot cpucap handling with system cpucap handling
  arm64: Cleanup system cpucap handling
  arm64: Kconfig: drop KAISER reference from KPTI option description
  arm64: mm: Only map KPTI trampoline if it is going to be used
  arm64: Get rid of ARM64_HAS_NO_HW_PREFETCH