Merge branch 'tracing/hw-breakpoints' into perf/core
Conflicts:
arch/x86/kernel/kprobes.c
kernel/trace/Makefile
Merge reason: hw-breakpoints perf integration is looking
good in testing and in reviews, plus conflicts
are mounting up - so merge & resolve.
Signed-off-by: NIngo Molnar <mingo@elte.hu>
Showing
arch/x86/kernel/hw_breakpoint.c
0 → 100644
include/linux/hw_breakpoint.h
0 → 100644
kernel/hw_breakpoint.c
0 → 100644
kernel/trace/trace_ksym.c
0 → 100644
samples/hw_breakpoint/Makefile
0 → 100644
想要评论请 注册 或 登录