Merge branch 'for-next/kprobes' into for-next/core
authorCatalin Marinas <catalin.marinas@arm.com>
Thu, 21 Jul 2016 17:20:41 +0000 (18:20 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Thu, 21 Jul 2016 17:20:41 +0000 (18:20 +0100)
commita95b0644b38c16c40b753224671b919b9af0b73c
tree62f4b54f35dd3a99d6a3c2337bddcf1c72c32c8c
parente75118a7b581b19b08282c7819c1ec6f68b91b79
parentf7e35c5ba4322838ce84b23a2f1a6d6b7f0b57ec
Merge branch 'for-next/kprobes' into for-next/core

* kprobes:
  arm64: kprobes: Add KASAN instrumentation around stack accesses
  arm64: kprobes: Cleanup jprobe_return
  arm64: kprobes: Fix overflow when saving stack
  arm64: kprobes: WARN if attempting to step with PSTATE.D=1
  kprobes: Add arm64 case in kprobe example module
  arm64: Add kernel return probes support (kretprobes)
  arm64: Add trampoline code for kretprobes
  arm64: kprobes instruction simulation support
  arm64: Treat all entry code as non-kprobe-able
  arm64: Blacklist non-kprobe-able symbol
  arm64: Kprobes with single stepping support
  arm64: add conditional instruction simulation support
  arm64: Add more test functions to insn.c
  arm64: Add HAVE_REGS_AND_STACK_ACCESS_API feature
arch/arm64/Kconfig
arch/arm64/include/asm/ptrace.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/arm64ksyms.c
arch/arm64/kernel/armv8_deprecated.c
arch/arm64/kernel/asm-offsets.c
arch/arm64/kernel/debug-monitors.c
arch/arm64/kernel/entry.S
arch/arm64/kernel/vmlinux.lds.S
arch/arm64/mm/fault.c