Merge branch 'fixes' into next
authorUlf Hansson <ulf.hansson@linaro.org>
Tue, 21 Dec 2021 12:04:51 +0000 (13:04 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 21 Dec 2021 12:04:51 +0000 (13:04 +0100)

Trivial merge