Arnaldo Carvalho de Melo 1a931707ad Merge remote-tracking branch 'torvalds/master' into perf/core ...

To resolve a trivial merge conflict with c302378bc1 ("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>

2022-12-16 09:53:53 -03:00

7.2 KiB

Raw Blame History

View Raw