git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 818448e 84e57d2)
Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 16 Dec 2022 12:53:53 +0000 (09:53 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 16 Dec 2022 12:53:53 +0000 (09:53 -0300)
commit1a931707ad4a46e79d4ecfee56d8f6e8cc8d4f28
treec3ed4dafca580360da63eef576b35eb67eb2e5a2tree
parent818448e9cf92e5c6b3c10320372eefcbe4174e4fcommit | diff
parent84e57d292203a45c96dbcb2e6be9dd80961d981acommit | diff
Merge remote-tracking branch 'torvalds/master' into perf/core

To resolve a trivial merge conflict with c302378bc157f6a7 ("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>
MAINTAINERS diff1 | diff2 | blob | history
tools/lib/bpf/Makefile diff1 | diff2 | blob | history
tools/perf/tests/expr.c diff1 | diff2 | blob | history
tools/perf/tests/pmu-events.c diff1 | diff2 | blob | history
tools/perf/util/bpf-loader.c diff1 | diff2 | blob | history
tools/perf/util/evsel.c diff1 | diff2 | blob | history
tools/perf/util/expr.c diff1 | diff2 | blob | history
tools/perf/util/metricgroup.c diff1 | diff2 | blob | history
tools/perf/util/stat-shadow.c diff1 | diff2 | blob | history
tools/perf/util/stat.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.