Merge branch 'perf/kprobes' into perf/core
Conflicts:
arch/x86/kernel/traps.c
The kprobes enhancements are fully cooked, ship them upstream.
Signed-off-by: NIngo Molnar <mingo@kernel.org>
Showing
此差异已折叠。
想要评论请 注册 或 登录
Conflicts:
arch/x86/kernel/traps.c
The kprobes enhancements are fully cooked, ship them upstream.
Signed-off-by: NIngo Molnar <mingo@kernel.org>