git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.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	1c65163ca04cbe1b5b8769ffbdc94125ba3af4d5
tree	163d5e50169ce0399add99cba49a760214de05db	tree \| snapshot
parent	71ed69285ab4df41102c789fad1b9b026e4d3565	commit \| diff
parent	ee7c5a800b7712543c03f412a7611ba9000cd43f	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>

Linux Kernel Source Tree.

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