From: Will Deacon <will@kernel.org>
Date: Thu, 4 Jan 2024 12:26:56 +0000 (+0000)
Subject: Merge branch 'for-next/cpufeature' into for-next/core
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3f35db4e68ceb84aad9f3ae0ae0a13779ada5b5c;p=linux.git

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
---

3f35db4e68ceb84aad9f3ae0ae0a13779ada5b5c