Merge drm/drm-next into drm-intel-next-queued
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 25 Feb 2020 17:29:58 +0000 (09:29 -0800)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 25 Feb 2020 17:39:23 +0000 (09:39 -0800)
commitff36e78fdb251b9fa65028554689806961e011eb
treef5af925d509224e06a10936196be6c06bcbdc6ae
parent143d9c3e7b6aa2b785abba04266ed75f2b52e94a
parent1b245ec5b685ebf8e6e5d1e6b5bcc03b6608e8b0
Merge drm/drm-next into drm-intel-next-queued

Some DSI and VBT pending patches from Hans will apply
cleanly and with less ugly conflicts if they are rebuilt
on top of other patches that recently landed on drm-next.

Reference: https://patchwork.freedesktop.org/series/70952/
Cc: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com
MAINTAINERS
drivers/gpu/drm/i915/display/icl_dsi.c
drivers/gpu/drm/i915/display/intel_display_types.h
drivers/gpu/drm/i915/display/intel_dp.c
drivers/gpu/drm/i915/display/vlv_dsi.c
drivers/gpu/drm/i915/gt/intel_ggtt.c
drivers/gpu/drm/i915/i915_drv.c