Merge remote-tracking branch 'torvalds/master' into perf/urgent
authorArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 21 May 2021 18:59:23 +0000 (15:59 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 21 May 2021 18:59:23 +0000 (15:59 -0300)
To pick up more UAPI updates to sync with tools/.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Trivial merge