Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 17 Feb 2022 21:40:54 +0000 (18:40 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 17 Feb 2022 21:40:54 +0000 (18:40 -0300)
To pick up fixes from perf/urgent that recently got merged.

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

Simple merge
Simple merge