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

To pick up fixes.

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

diff --cc tools/perf/tests/shell/record+probe_libc_inet_pton.sh
Simple merge

diff --cc tools/perf/util/evsel.c
Simple merge

diff --cc tools/perf/util/header.c
Simple merge

diff --cc tools/perf/util/machine.c
Simple merge

diff --cc tools/perf/util/thread.c
Simple merge