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

To pick up fixes sent via perf/urgent and in the BPF tools/ directories.

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc tools/perf/tests/shell/daemon.sh
Simple merge

diff --cc tools/perf/util/parse-events.c
Simple merge

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

diff --cc tools/perf/util/synthetic-events.c
Simple merge