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)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge