Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 14 Mar 2022 22:15:16 +0000 (19:15 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 14 Mar 2022 22:15:16 +0000 (19:15 -0300)
To pick up fixes that went thru perf/urgent.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1  2 
tools/perf/builtin-script.c
tools/perf/util/data.c

Simple merge
Simple merge