]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'vmwgfx-fixes-4.16' of git://people.freedesktop.org/~thomash/linux into...
authorDave Airlie <airlied@redhat.com>
Thu, 22 Mar 2018 20:15:08 +0000 (06:15 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 22 Mar 2018 20:15:08 +0000 (06:15 +1000)
Two vmwgfx fixes for 4.16. Both cc'd stable.

* 'vmwgfx-fixes-4.16' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Fix a destoy-while-held mutex problem.
  drm/vmwgfx: Fix black screen and device errors when running without fbdev


Trivial merge