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

Trivial merge