Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 26 Jul 2021 10:37:53 +0000 (20:37 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 26 Jul 2021 10:37:53 +0000 (20:37 +1000)
Merge our fixes branch, which contains some fixes that didn't make it
into rc2 but which we'd like in next.


Trivial merge