Merge branch 'fixes' into next

Merge our fixes branch to bring in a few things that new feature patches
rely on or conflict with.
This commit is contained in:
Michael Ellerman 2022-09-24 00:40:14 +10:00
commit ec5c3a359c
7 changed files with 91 additions and 70 deletions