Merge remote-tracking branch 'tip/perf/urgent' into perf/core

author Arnaldo Carvalho de Melo <acme@redhat.com>

Tue, 24 Jul 2018 17:34:32 +0000 (14:34 -0300)

committer Arnaldo Carvalho de Melo <acme@redhat.com>

Tue, 24 Jul 2018 17:34:32 +0000 (14:34 -0300)
author Arnaldo Carvalho de Melo <acme@redhat.com>
Tue, 24 Jul 2018 17:34:32 +0000 (14:34 -0300)
committer Arnaldo Carvalho de Melo <acme@redhat.com>
Tue, 24 Jul 2018 17:34:32 +0000 (14:34 -0300)
diff --cc kernel/events/core.c
Simple merge
diff --cc kernel/trace/trace_kprobe.c
Simple merge
author	Arnaldo Carvalho de Melo <acme@redhat.com>
	Tue, 24 Jul 2018 17:34:32 +0000 (14:34 -0300)
committer	Arnaldo Carvalho de Melo <acme@redhat.com>
	Tue, 24 Jul 2018 17:34:32 +0000 (14:34 -0300)
		1	2
kernel/events/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_kprobe.c	patch \|	diff1 \|	diff2 \|	blob \| history