Merge branch 'for-next/kernel-ptrauth' into for-next/core
authorCatalin Marinas <catalin.marinas@arm.com>
Wed, 25 Mar 2020 11:11:08 +0000 (11:11 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Wed, 25 Mar 2020 11:11:08 +0000 (11:11 +0000)
commit44ca0e00b6a05ea9cf89d8a5290a225de19f4a2a
tree781fad5d055110645a037e61fa9d28d53e51572c
parent806dc825f01f1543f613b8195112ef06d04eb6d3
parent3b446c7d27ddd06342901bb35211363f6944291a
Merge branch 'for-next/kernel-ptrauth' into for-next/core

* for-next/kernel-ptrauth:
  : Return address signing - in-kernel support
  arm64: Kconfig: verify binutils support for ARM64_PTR_AUTH
  lkdtm: arm64: test kernel pointer authentication
  arm64: compile the kernel with ptrauth return address signing
  kconfig: Add support for 'as-option'
  arm64: suspend: restore the kernel ptrauth keys
  arm64: __show_regs: strip PAC from lr in printk
  arm64: unwind: strip PAC from kernel addresses
  arm64: mask PAC bits of __builtin_return_address
  arm64: initialize ptrauth keys for kernel booting task
  arm64: initialize and switch ptrauth kernel keys
  arm64: enable ptrauth earlier
  arm64: cpufeature: handle conflicts based on capability
  arm64: cpufeature: Move cpu capability helpers inside C file
  arm64: ptrauth: Add bootup/runtime flags for __cpu_setup
  arm64: install user ptrauth keys at kernel exit time
  arm64: rename ptrauth key structures to be user-specific
  arm64: cpufeature: add pointer auth meta-capabilities
  arm64: cpufeature: Fix meta-capability cpufeature check
arch/arm64/Kconfig
arch/arm64/include/asm/cpucaps.h
arch/arm64/include/asm/cpufeature.h
arch/arm64/kernel/cpufeature.c
arch/arm64/kernel/entry.S
arch/arm64/kernel/head.S
arch/arm64/kernel/smp.c
arch/arm64/mm/proc.S