]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge drm/drm-next into drm-misc-next
authorPaul Cercueil <paul@crapouillou.net>
Mon, 18 Apr 2022 19:44:36 +0000 (20:44 +0100)
committerPaul Cercueil <paul@crapouillou.net>
Mon, 18 Apr 2022 19:46:55 +0000 (20:46 +0100)
drm/drm-next has a build fix for the NewVision NV3052C panel
(drivers/gpu/drm/panel/panel-newvision-nv3052c.c), which needs to be
merged back to drm-misc-next, as it was failing to build there.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
1  2 
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/dp/drm_dp.c
drivers/gpu/drm/i915/display/intel_atomic_plane.c
drivers/gpu/drm/i915/gem/i915_gem_lmem.c
drivers/gpu/drm/i915/gem/i915_gem_object.c
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
drivers/video/fbdev/core/fbmem.c
include/drm/dp/drm_dp_helper.h

Simple merge
Simple merge
Simple merge