Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up some tools/perf/ patches that went via tip/perf/core, such
as:

  tools/perf: Add mem_hops field in perf_mem_data_src structure

Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --cc tools/include/uapi/linux/perf_event.h
Simple merge

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