OSDN Git Service

Merge branch 'perf/urgent' into perf/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Wed, 25 Jul 2018 09:47:02 +0000 (11:47 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 25 Jul 2018 09:47:02 +0000 (11:47 +0200)
commit93081caaaed6a40a4f6d9b7ba3f581a4bb1d4404
treef574201ba58ddf9e6264f463e613066cfc8532ba
parent788faab70d5a882693286b8d5022779559c79904
parent7f635ff187ab6be0b350b3ec06791e376af238ab
Merge branch 'perf/urgent' into perf/core, to pick up fixes

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