Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 13 Jan 2022 13:20:59 +0000 (10:20 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 13 Jan 2022 13:20:59 +0000 (10:20 -0300)
commit1aa77e716c6f2332f2d4664f747ff4eba731825b
treebffb043cec73da6c79d4ec652e531f86344b160b
parentc0dd94558d0e473aa92254e1c48a47900c911e69
parent455e73a07f6e288b0061dfcf4fcf54fa9fe06458
Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up fixes and get in line with other trees, powerpc kernel
mostly this time, but BPF as well.

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