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)
commit272172bd418cc32aa466588150c8001bc229c712
treef529a66933e79ba1f3753e8185112538e861c967
parent7f06d0aa530cc61cb5e048d4eb34921dee12058a
parentd45331b00ddb179e291766617259261c112db872
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