Merge branch 'fixes' into next
authorUlf Hansson <ulf.hansson@linaro.org>
Thu, 28 Oct 2021 21:20:27 +0000 (23:20 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Thu, 28 Oct 2021 21:20:27 +0000 (23:20 +0200)

Trivial merge