Merge branch 'for-next/ptrauth' into for-next/core
authorWill Deacon <will@kernel.org>
Thu, 24 Jun 2021 13:06:23 +0000 (14:06 +0100)
committerWill Deacon <will@kernel.org>
Thu, 24 Jun 2021 13:06:23 +0000 (14:06 +0100)
commitbd23fdba41783251c82e9b6476bcef39a37c9bbd
treed805e8b15628b2080ef5d8b6b37fdd4ceb043cfc
parent2e5d34d26a906f17a773cd3c67ee91dd2118c898
parentd053e71ac8442d4fd24fb85591489813cdb56365
Merge branch 'for-next/ptrauth' into for-next/core

Allow Pointer Authentication to be configured independently for kernel
and userspace.

* for-next/ptrauth:
  arm64: Conditionally configure PTR_AUTH key of the kernel.
  arm64: Add ARM64_PTR_AUTH_KERNEL config option
arch/arm64/include/asm/processor.h
arch/arm64/kernel/asm-offsets.c