From: Arnaldo Carvalho de Melo Date: Mon, 8 Mar 2021 13:11:33 +0000 (-0300) Subject: Merge remote-tracking branch 'torvalds/master' into perf/core X-Git-Tag: microblaze-v5.14~75^2~110 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=009ef05f98129aa91c62c3baab859ba593a15bb2;p=linux-2.6-microblaze.git 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 --- 009ef05f98129aa91c62c3baab859ba593a15bb2