Merge 'tip/perf/urgent' into perf/core to pick fixes

Needed to build perf/core buildable in some cases.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --cc arch/x86/kernel/kprobes/opt.c
Simple merge

diff --cc tools/perf/util/evlist.h
Simple merge

diff --cc tools/perf/util/symbol-elf.c
Simple merge