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)
commit859f7e45542aecaa77fde929232cbcf91b29e11d
tree5e81bbb0145bf2467e85ee8106734b4130f52ec0
parent052747700e914896e8c78ff019411487dc7c12a0
parentb3d971ec25346d6890e9e8f05b63f758cfcef8c5
Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up fixes from perf/urgent that recently got merged.

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