Merge drm-next into drm-intel-next-queued
authorJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Wed, 28 Feb 2018 10:12:03 +0000 (12:12 +0200)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Wed, 28 Feb 2018 10:12:03 +0000 (12:12 +0200)
commitf074037a2eb1ff21e258a27a6270bae126ded062
tree06026bbe2f356f61a57cf420e0075a9986ad41e4
parent73c0fcac97bf7f4a6a61b825b205d1cf127cfca7
parentb8a89f530f5692c70778c965f0bc8f5a61fbe703
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>
drivers/gpu/drm/i915/gvt/dmabuf.c