Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 8 Oct 2021 14:13:17 +0000 (11:13 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 8 Oct 2021 14:13:17 +0000 (11:13 -0300)
commit47e7dd34a26def31af352df3a8281e7ff1bc345a
treef8cbd86ce126d65f79bca2ceefbaea6130923e1b
parentbe8ecc57f180415e8a7c1cc5620c5236be2a7e56
parent1da38549dd64c7f5dd22427f12dfa8db3d8a722b
Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up the fixes in perf/urgent that were just merged into upstream.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/Makefile.config
tools/perf/Makefile.perf
tools/perf/pmu-events/jevents.c
tools/perf/tests/code-reading.c