]> www.infradead.org Git - users/hch/xfs.git/commitdiff
projects / users / hch / xfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e5d34d d053e71)
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)
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

1  2 
arch/arm64/include/asm/processor.h patch | diff1 | diff2 | blob | history
arch/arm64/kernel/asm-offsets.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm64/include/asm/processor.h
Simple merge
diff --cc arch/arm64/kernel/asm-offsets.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.