Merge drm/drm-next into drm-intel-next-queued
authorJani Nikula <jani.nikula@intel.com>
Tue, 28 May 2019 08:07:59 +0000 (11:07 +0300)
committerJani Nikula <jani.nikula@intel.com>
Tue, 28 May 2019 08:07:59 +0000 (11:07 +0300)
Get the HDR dependencies originally merged via drm-misc. Sync up all
i915 changes applied via other trees. And get v5.2-rc2 as the baseline.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1  2 
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_display.c

Simple merge
Simple merge