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 <[email protected]>

diff --cc tools/perf/builtin-trace.c
Simple merge

diff --cc tools/perf/util/bpf-loader.c
Simple merge