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>

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

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

diff --cc tools/perf/util/bpf_counter.c
Simple merge