tree 2b8054150cb65bb153dccb13bd78e02ab0f88589
parent 2734d6c1b1a089fb593ef6a23d4b70903526fe0c
parent d9c57d3ed52a92536f5fa59dc5ccdd58b4875076
author Michael Ellerman <mpe@ellerman.id.au> 1627295873 +1000
committer Michael Ellerman <mpe@ellerman.id.au> 1627295873 +1000

Merge branch 'fixes' into next

Merge our fixes branch, which contains some fixes that didn't make it
into rc2 but which we'd like in next.