]> git.baikalelectronics.ru Git - kernel.git/commit
Merge v5.4-rc4 into drm-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 23 Oct 2019 10:02:47 +0000 (12:02 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 23 Oct 2019 10:10:05 +0000 (12:10 +0200)
commit15c0966246dbd9e7b080a746375dadacd3b35298
treee7ec9782c0b7831c511af711424126a2b9a4eb07
parent4f36c7681b6f744bdc2c9ac3a5855b2213d40c17
parentd55ec79322ce9b92dd17cc61a7dbc4dc812814a3
Merge v5.4-rc4 into drm-next

Thierry needs ed4f3708f736 ("drm/bridge: tc358767: fix max_tu_symbol
value") to be able to merge his dp_link patch series.

Some adjacent changes conflicts, plus some clashes in i915 due to
cherry-picking and git trying to be helpful and leaving both versions
in.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
12 files changed:
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
drivers/gpu/drm/bridge/tc358767.c
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/panel/panel-lg-lb035q02.c
drivers/gpu/drm/panel/panel-nec-nl8048hl11.c
drivers/gpu/drm/panel/panel-sony-acx565akm.c
drivers/gpu/drm/panel/panel-tpo-td028ttec1.c
drivers/gpu/drm/panel/panel-tpo-td043mtea1.c
drivers/gpu/drm/radeon/radeon_drv.c
drivers/gpu/drm/ttm/ttm_bo.c
drivers/gpu/drm/ttm/ttm_bo_vm.c