git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: eb185a3 6efb943)

author	Thomas Zimmermann <tzimmermann@suse.de>
	Tue, 11 May 2021 13:59:18 +0000 (15:59 +0200)
committer	Thomas Zimmermann <tzimmermann@suse.de>
	Tue, 11 May 2021 13:59:18 +0000 (15:59 +0200)
commit	fd531024bad7e5799e968ca70c0d3ca7b96b71ef
tree	a6abb8be6a97c632a1327547a30c7119365e62c0	tree \| snapshot
parent	eb185a3212b5edca30da0ab4ec21d69a012bcb69	commit \| diff
parent	6efb943b8616ec53a5e444193dccf1af9ad627b5	commit \| diff

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

Backmerging to get v5.12 fixes. Requested for vmwgfx.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

17 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/dc_link.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_modes.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_dp_link_training.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/qxl/qxl_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/dc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/drm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git