Merge drm/drm-next into drm-misc-next
authorMaxime Ripard <mripard@kernel.org>
Tue, 23 Apr 2024 06:48:56 +0000 (08:48 +0200)
committerMaxime Ripard <mripard@kernel.org>
Tue, 23 Apr 2024 06:48:56 +0000 (08:48 +0200)
commitc058e7a8f8af355e4a441c89400a6e95a16320e5
treeed96dcd06e69f508a3f8a112a29fd228289429a6
parent6221deb716b9d5397c09ba6567f7ae61d8cbeb98
parent0208ca55aa9c9b997da1f5bc45c4e98916323f08
Merge drm/drm-next into drm-misc-next

MaĆ­ra needs a backmerge to apply v3d patches, and Danilo for some
nouveau patches.

Signed-off-by: Maxime Ripard <mripard@kernel.org>
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h