]> 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)
commit68565f5f4c2ea078401a47b319f769fe198d8cb8
treef529a66933e79ba1f3753e8185112538e861c967
parentea05263f51f5a162d48de4f28977229c5bffd9a8
parenta2e8c383b17a2d6e840c741e443bf5c89e5e0a84
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