From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Date: Wed, 28 Feb 2018 10:12:03 +0000 (+0200)
Subject: Merge drm-next into drm-intel-next-queued
X-Git-Tag: v4.17-rc1~185^2~14^2~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f074037a2eb1ff21e258a27a6270bae126ded062;p=thirdparty%2Flinux.git

Merge drm-next into drm-intel-next-queued

To pull in the HDCP changes, especially wait_for changes to drm/i915
that Chris wants to build on top of.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---

f074037a2eb1ff21e258a27a6270bae126ded062