Merge tag 'v4.15-rc1' into drm-misc-fixes
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 27 Nov 2017 09:54:33 +0000 (10:54 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 27 Nov 2017 09:54:33 +0000 (10:54 +0100)
commit1420edf7a3fbc9b8b0bbe24c3724d582dd4def28
tree919f3adb874b11cb5e4ed2df37a9370847300ea4
parent517f56839f581618d24f2e67a35738a5c6cbaecb
parent4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323
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>
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/i915/intel_hdmi.c
drivers/gpu/drm/rockchip/dw-mipi-dsi.c
drivers/gpu/drm/vc4/vc4_hdmi.c
include/drm/drm_edid.h