Merge branch 'perf/kprobes' into perf/core
authorIngo Molnar <mingo@kernel.org>
Thu, 5 Jun 2014 09:18:34 +0000 (11:18 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 5 Jun 2014 10:26:50 +0000 (12:26 +0200)
commit10b0256496fd6c162478547f7c6df1e052e87644
tree7037905737ae83a86a5cdb376cd1d66f7f407e2e
parentc56d34064b6eb9f9cde9e35bbfe16eedf3d81f94
parent69902c718c0b476e94ed7fccd3cf29ca39fe433a
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: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/traps.h
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/traps.c
kernel/trace/trace_uprobe.c