tree 05dce785f3a70e022b91016c87e4092f143a2fef
parent c83ecfa5851f4d35be88f32dabb3a53f51cf5c32
parent f150891fd9878ef0d9197c4e8451ce67c3bdd014
author Daniel Vetter <daniel.vetter@ffwll.ch> 1511260390 +0100
committer Daniel Vetter <daniel.vetter@ffwll.ch> 1511270276 +0100

Merge airlied/drm-next into drm-misc-next

Bake in the conflict between the drm_print.h extraction and the
addition of DRM_DEBUG_LEASES since we lost it a few too many times.

Also fix a new use of drm_plane_helper_check_state in msm to follow
Ville's conversion in

commit a01cb8ba3f6282934cff65e89ab36b18b14cbe27
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date:   Wed Nov 1 22:16:19 2017 +0200

    drm: Move drm_plane_helper_check_state() into drm_atomic_helper.c

Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>