Merge tag 'drm-fixes-for-v4.15-rc6' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Dec 2017 07:16:24 +0000 (23:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Dec 2017 07:16:24 +0000 (23:16 -0800)
commitfd84b751ddb7dab7a8c22826e7bff85f3ff3f9a6
tree8fd06aa1580e976a854a0c9e733efa643667fea0
parentc0208a33cbc428f66b446f5dd16c91fb76aaab88
parent03bfd4e19b935adb8be4f7342f13395fb7f11096
Merge tag 'drm-fixes-for-v4.15-rc6' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "nouveau and i915 regression fixes"

* tag 'drm-fixes-for-v4.15-rc6' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau: fix race when adding delayed work items
  i915: Reject CCS modifiers for pipe C on Geminilake
  drm/i915/gvt: Fix pipe A enable as default for vgpu