Merge branch 'for-next/bti-user' into for-next/bti
authorWill Deacon <will@kernel.org>
Tue, 5 May 2020 14:15:58 +0000 (15:15 +0100)
committerWill Deacon <will@kernel.org>
Tue, 5 May 2020 14:15:58 +0000 (15:15 +0100)
commit80e4e561321595d2e5f4a173e8cf8d8432078995
tree50f80176b431998f25b45b68300a92765d6c05d9
parent6a8b55ed4056ea5559ebe4f6a4b247f627870d4c
parent5d1b631c773ffbbadcbb3176a2ae0ea9d1c114c7
Merge branch 'for-next/bti-user' into for-next/bti

Merge in user support for Branch Target Identification, which narrowly
missed the cut for 5.7 after a late ABI concern.

* for-next/bti-user:
  arm64: bti: Document behaviour for dynamically linked binaries
  arm64: elf: Fix allnoconfig kernel build with !ARCH_USE_GNU_PROPERTY
  arm64: BTI: Add Kconfig entry for userspace BTI
  mm: smaps: Report arm64 guarded pages in smaps
  arm64: mm: Display guarded pages in ptdump
  KVM: arm64: BTI: Reset BTYPE when skipping emulated instructions
  arm64: BTI: Reset BTYPE when skipping emulated instructions
  arm64: traps: Shuffle code to eliminate forward declarations
  arm64: unify native/compat instruction skipping
  arm64: BTI: Decode BYTPE bits when printing PSTATE
  arm64: elf: Enable BTI at exec based on ELF program properties
  elf: Allow arch to tweak initial mmap prot flags
  arm64: Basic Branch Target Identification support
  ELF: Add ELF program property parsing support
  ELF: UAPI and Kconfig additions for ELF program properties
14 files changed:
Documentation/filesystems/proc.rst
arch/arm64/Kconfig
arch/arm64/include/asm/cpucaps.h
arch/arm64/include/asm/cpufeature.h
arch/arm64/include/asm/esr.h
arch/arm64/include/asm/kvm_emulate.h
arch/arm64/include/asm/sysreg.h
arch/arm64/kernel/cpufeature.c
arch/arm64/kernel/entry-common.c
arch/arm64/kernel/process.c
arch/arm64/kernel/ptrace.c
fs/binfmt_elf.c
fs/proc/task_mmu.c
include/linux/mm.h