Merge tag 'v4.15-rc1' into drm-misc-fixes

Linux 4.15-rc1

Pull in the merge window to resync. Dave didn't get his -fixes pull
landed in time, and now there's another rockchip fix pending, so
fast-forwarding isn't possible, hence backmerge.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

diff --cc drivers/gpu/drm/drm_edid.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_hdmi.c
Simple merge

diff --cc drivers/gpu/drm/rockchip/dw-mipi-dsi.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
Simple merge

diff --cc include/drm/drm_edid.h
Simple merge