Merge drm/drm-next into drm-misc-next
authorMaxime Ripard <maxime@cerno.tech>
Tue, 3 May 2022 09:53:42 +0000 (11:53 +0200)
committerMaxime Ripard <maxime@cerno.tech>
Tue, 3 May 2022 09:53:42 +0000 (11:53 +0200)
Christian needs a backmerge to avoid a merge conflict for amdgpu.

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

Trivial merge