From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 5 Apr 2021 06:57:44 +0000 (+0200)
Subject: Merge 5.12-rc6 into staging-next
X-Git-Tag: iomap-folio-5.17-old~1610^2~262
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e5c7bccc3775b49cd7006331826aa90cb76c1992;p=users%2Fwilly%2Flinux.git

Merge 5.12-rc6 into staging-next

We need the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

e5c7bccc3775b49cd7006331826aa90cb76c1992