Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 20 Jan 2021 17:35:31 +0000 (14:35 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 20 Jan 2021 17:35:31 +0000 (14:35 -0300)
commitcd07e536b0201fceffd90a701bfb1e1fc07fcd34
tree4777d4b2f749b279fc07bd41f11b88c9e4578afe
parent47fddcb479e73c341fb414e40a89572dacadd360
parent45dfb8a5659ad286c28fa59008271dbc4e5e3f2d
Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up fixes.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/machine.c
tools/perf/util/session.c