Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 8 Mar 2021 13:11:33 +0000 (10:11 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 8 Mar 2021 13:11:33 +0000 (10:11 -0300)
commit009ef05f98129aa91c62c3baab859ba593a15bb2
treef3414f08d636a597545b1e4f443b373b9d6d8f4b
parent2777b81b379df772defd654bc4d3fa82dca17a4b
parent144c79ef33536b4ecb4951e07dbc1f2b7fa99d32
Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up the fixes sent for v5.12 and continue development based on
v5.12-rc2, i.e. without the swap on file bug.

This also gets a slightly newer and better tools/perf/arch/arm/util/cs-etm.c
patch version, using the BIT() macro, that had already been slated to
v5.13 but ended up going to v5.12-rc1 on an older version.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/Makefile.perf
tools/perf/arch/arm/util/cs-etm.c