]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 12 Aug 2019 19:25:00 +0000 (16:25 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 12 Aug 2019 19:25:00 +0000 (16:25 -0300)
commitdf8a6975aa7dc4b661f30d4f0c365a08e2ca2c8a
treef529a66933e79ba1f3753e8185112538e861c967
parent40a8be3b711c395a9b89dd677f1720d8359e775a
parent2dff16f0892f88e5038eb0b7cb5f72de1ee9033e
Merge remote-tracking branch 'torvalds/master' into perf/core

To get closer to upstream and check if we need to sync more UAPI
headers, pick up fixes for libbpf that prevent perf's container tests
from completing successfuly, etc.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/builtin-ftrace.c
tools/perf/util/annotate.c
tools/perf/util/cpumap.c
tools/perf/util/machine.c
tools/perf/util/machine.h