Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Sat, 6 Nov 2021 18:49:33 +0000 (15:49 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Sat, 6 Nov 2021 18:49:33 +0000 (15:49 -0300)
commit7f9f879243d6cf5d2d60d12065e93189cc343387
treee74619a16f8291f7225ee9877cf93e530243e0d3
parent32f7aa2731b24ad8393f26d63df959d74844345f
parentfe91c4725aeed35023ba4f7a1e1adfebb6878c23
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 <acme@redhat.com>
tools/include/uapi/linux/perf_event.h
tools/perf/util/bpf-event.c