From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 3 May 2017 19:41:35 +0000 (+0200)
Subject: Merge tag 'tags/drm-for-v4.12' into drm-intel-next-queued
X-Git-Tag: v4.13-rc1~73^2~28^2~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad15f74ac6c7ed1c7c252a760b017da042ec83fb;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'tags/drm-for-v4.12' into drm-intel-next-queued

Backmerge the main drm-next pull to sync up.

Chris also pointed out that

commit ade0b0c965f59176daddbef9c4717354034f9bce
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Sat Apr 22 09:15:37 2017 +0100

    drm/i915: Confirm the request is still active before adding it to the await

is double-applied in the git merge, so make sure we get this right.

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

ad15f74ac6c7ed1c7c252a760b017da042ec83fb