[GIT PULL] Armada DRM (drm-armada-devel-4.15 branch)

[Dave Airlie]

On 1 January 2018 at 22:19, Russell King <rmk at armlinux.org.uk> wrote:
> David,
>
> Please incorporate the latest Armada DRM (drm-armada-devel-4.15 branch),
> which can be found at:
>
>   git://git.armlinux.org.uk/~rmk/linux-arm.git drm-armada-devel-4.15

This conflicted with:

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

    drm: Move drm_plane_helper_check_state() into drm_atomic_helper.c

I've fixed up the version I pulled into drm-next, but I'd appreciate
if you could give it a test.

Dave.