git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Tue, 13 Apr 2021 21:06:34 +0000 (23:06 +0200)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Tue, 13 Apr 2021 21:15:09 +0000 (23:15 +0200)
commit	213cc929cbfd7962164420b300f9a6c60aaff189
tree	163d5e50169ce0399add99cba49a760214de05db	tree
parent	cd951b3971cdc1f8c76b075f2c97ff357bf141e2	commit \| diff
parent	d434405aaab7d0ebc516b68a8fc4100922d7f5ef	commit \| diff

Merge drm/drm-fixes into drm-next

msm-next pull request has a baseline with stuff from -fixes, roll
forward first.

Some simple conflicts in amdgpu, ttm and one in i915 where git gets
confused and tries to add the same function twice.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos5433_drm_decon.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/msm_atomic.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/dss/dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/dc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vc4/vc4_plane.c	diff1 \|	diff2 \|	blob \| history
include/drm/ttm/ttm_bo_api.h	diff1 \|	diff2 \|	blob \| history
kernel/irq/manage.c	diff1 \|	diff2 \|	blob \| history