Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 23 Sep 2022 14:40:14 +0000 (00:40 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 23 Sep 2022 14:40:14 +0000 (00:40 +1000)
Merge our fixes branch to bring in a few things that new feature patches
rely on or conflict with.


Trivial merge