From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 5 Apr 2021 06:43:50 +0000 (+0200)
Subject: Merge 5.12-rc6 into char-misc-next
X-Git-Tag: howlett/maple/20220722_2~3338^2~41
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=422d2245136a2c49550dc83ca9735dd4d8ea71f7;p=users%2Fjedix%2Flinux-maple.git

Merge 5.12-rc6 into char-misc-next

We need the char/misc fixes in here as well.

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

422d2245136a2c49550dc83ca9735dd4d8ea71f7