Merge drm/drm-next into drm-misc-next
authorMaxime Ripard <maxime@cerno.tech>
Wed, 13 Jul 2022 08:33:00 +0000 (10:33 +0200)
committerMaxime Ripard <maxime@cerno.tech>
Wed, 13 Jul 2022 08:33:00 +0000 (10:33 +0200)
I need to have some vc4 patches merged in -rc4, but drm-misc-next is
only at -rc2 for now.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
1  2 
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
drivers/gpu/drm/ttm/ttm_bo.c
drivers/gpu/drm/vc4/vc4_hdmi.c
include/uapi/drm/drm_fourcc.h

Simple merge
Simple merge
Simple merge