Merge remote-tracking branch 'torvalds/master' into perf/core

To get closer to upstream and check if we need to sync more UAPI
headers, pick up fixes for libbpf that prevent perf's container tests
from completing successfuly, etc.

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

diff --cc tools/perf/builtin-ftrace.c
Simple merge

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

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

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

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