From: Maxime Ripard <maxime@cerno.tech>
Date: Tue, 3 May 2022 09:53:42 +0000 (+0200)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Tag: howlett/maple/20220722_2~460^2~9^2~37
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b812f646bb818ca0e1806072eb7f0006f3a65dde;p=users%2Fjedix%2Flinux-maple.git

Merge drm/drm-next into drm-misc-next

Christian needs a backmerge to avoid a merge conflict for amdgpu.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---

b812f646bb818ca0e1806072eb7f0006f3a65dde