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

To resolve a trivial merge conflict with c302378b

 ("libbpf:
Hashmap interface update to allow both long and void* keys/values"),
where a function present upstream was removed in the perf tools
development tree.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>