Merge branch 'perf/vlbr'

diff --cc arch/x86/kernel/kprobes/core.c
Simple merge

diff --cc arch/x86/kernel/kprobes/opt.c
Simple merge

diff --cc include/linux/kprobes.h
Simple merge

diff --cc kernel/kprobes.c
Simple merge

diff --cc kernel/trace/ftrace.c
Simple merge