From: Michael Ellerman <mpe@ellerman.id.au>
Date: Mon, 26 Jul 2021 10:37:53 +0000 (+1000)
Subject: Merge branch 'fixes' into next
X-Git-Tag: iomap-folio-5.17-old~666^2~141
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e1ab9a730b426fadc018f91b7c98412473e542fb;p=users%2Fwilly%2Flinux.git

Merge branch 'fixes' into next

Merge our fixes branch, which contains some fixes that didn't make it
into rc2 but which we'd like in next.
---

e1ab9a730b426fadc018f91b7c98412473e542fb