Merge branch 'perf/urgent' into perf/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Sat, 17 Feb 2018 10:39:28 +0000 (11:39 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 17 Feb 2018 10:39:28 +0000 (11:39 +0100)
commit7057bb975dab827997e0ca9dd92cafef0856b0cc
tree7784dc59c03f25b6bc4fa5cc12d5b61cb8b53765
parent33ea4b24277b06dbc55d7f5772a46f029600255e
parent297f9233b53a08fd457815e19f1d6f2c3389857b
Merge branch 'perf/urgent' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
include/linux/trace_events.h
include/uapi/linux/perf_event.h
kernel/events/core.c
kernel/trace/trace_kprobe.c
kernel/trace/trace_probe.h
kernel/trace/trace_uprobe.c
tools/include/uapi/linux/perf_event.h