Merge branch 'fixes' into next

Bring in our fixes branch for this cycle which avoids some small
conflicts with upcoming commits.
This commit is contained in:
Michael Ellerman 2020-09-14 22:57:18 +10:00
commit 960e370813
33 changed files with 181 additions and 65 deletions