Merge branch 'fixes' into next

Bring in a build fix for GCC12 from our fixes branch.
This commit is contained in:
Michael Ellerman 2022-07-25 12:04:44 +10:00
commit e7c45a0845