Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

remove-fbcon-notifiers topic branch is based on rc4, so we need a fresh
backmerge of drm-next to pull it in.

Signed-off-by: Maarten Lankhorst <[email protected]>

diff --cc drivers/gpu/drm/rockchip/cdn-dp-reg.c
Simple merge

diff --cc drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
Simple merge

diff --cc drivers/gpu/drm/rockchip/rockchip_drm_vop.c
Simple merge