Merge branch 'perf/urgent' into perf/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Fri, 20 Oct 2017 09:02:05 +0000 (11:02 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 20 Oct 2017 09:02:05 +0000 (11:02 +0200)
commitca4b9c3b743da39a6e0756a5c68edb35f6fc5e53
tree95ce0819f92e25bc4d768ab13cee1f385a83a7b2
parenta30b85df7d599f626973e9cd3056fe755bd778e0
parent275d34b82561e695339b782950d49c386169dae3
Merge branch 'perf/urgent' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
12 files changed:
arch/Kconfig
arch/x86/events/intel/core.c
arch/x86/kernel/kprobes/common.h
arch/x86/kernel/kprobes/core.c
kernel/events/core.c
tools/perf/Documentation/perf-record.txt
tools/perf/builtin-script.c
tools/perf/util/parse-events.c
tools/perf/util/parse-events.l
tools/perf/util/pmu.c
tools/perf/util/pmu.h
tools/perf/util/session.c