Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 29 Mar 2021 13:39:10 +0000 (10:39 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 29 Mar 2021 13:39:10 +0000 (10:39 -0300)
commitb0a752d43b1566451332bcb5b52b9694dfe7896c
tree1d5ea27a0ef6e74e2b9692e6c02d8d48710d1d36
parent50fa3a531e8e4b58550171fb159d0aa578c6b52d
parenta5e13c6df0e41702d2b2c77c8ad41677ebb065b3
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>
MAINTAINERS
tools/perf/builtin-daemon.c
tools/perf/tests/shell/daemon.sh
tools/perf/util/parse-events.c
tools/perf/util/pmu.c
tools/perf/util/synthetic-events.c