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)
To pick up fixes.

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

Simple merge
Simple merge