Merge existing fixes from spi/for-5.11
authorMark Brown <broonie@kernel.org>
Mon, 28 Dec 2020 12:24:35 +0000 (12:24 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 28 Dec 2020 12:24:35 +0000 (12:24 +0000)

Trivial merge