Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 22 Jun 2021 16:56:50 +0000 (13:56 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 22 Jun 2021 16:56:50 +0000 (13:56 -0300)
commitce09673636f9581d2e2e24af785c463c030a1fd8
tree5d696220bd70dcad7cc0809cf6e3225b4953bf05
parent45237f9898fce54a8cc6d40f7455291e0e6c4277
parenta96bfed64c8986d6404e553f18203cae1f5ac7e6
Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up fixes, since perf/urgent is already upstream.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/Makefile.config
tools/perf/builtin-record.c
tools/perf/tests/shell/stat_bpf_counters.sh
tools/perf/util/env.c
tools/perf/util/evsel.c
tools/perf/util/session.c
tools/perf/util/stat-display.c