OSDN Git Service

Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@kernel.org>
Thu, 29 Mar 2018 14:03:48 +0000 (16:03 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 29 Mar 2018 14:03:48 +0000 (16:03 +0200)
commit2d074918fb1568f398777343ff9a28049fb86337
tree84277c1471f6d575a9515d42a53345666addabc8
parent78282bec4b4a02a13b87d01fbe529396d37db926
parentf67b15037a7a50c57f72e69a6d59941ad90a0f0f
Merge branch 'perf/urgent' into perf/core

Conflicts:
kernel/events/hw_breakpoint.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/events/intel/ds.c
kernel/events/hw_breakpoint.c
kernel/trace/trace_kprobe.c
kernel/trace/trace_probe.h