Merge branch 'perf/vlbr'
authorPeter Zijlstra <peterz@infradead.org>
Thu, 2 Jul 2020 13:51:48 +0000 (15:51 +0200)
committerPeter Zijlstra <peterz@infradead.org>
Thu, 2 Jul 2020 13:51:48 +0000 (15:51 +0200)
commit78c2141b654375079e3737f06f19cabfc0fcecd7
tree5068a6c2904d93b61b37243ea39b728fe621196e
parentbb42b3d39781d7fcd3be7f9f9bf11b6661b5fdf1
parente1ad1ac2deb8f90af9f12ff316989dd5675dec11
Merge branch 'perf/vlbr'
arch/x86/kernel/kprobes/core.c
arch/x86/kernel/kprobes/opt.c
include/linux/kprobes.h
kernel/kprobes.c
kernel/trace/ftrace.c