]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit34a2a5e2e3e6c43f8595e0d71e43724ef99b9153
tree5d696220bd70dcad7cc0809cf6e3225b4953bf05
parent512e7d1c9194543515488b949987f221643be2ec
parenta8a9bdfee7f9e464f3ecc578f8e9e77f3a39a823
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