Merge branch 'vmwgfx-fixes-4.17' of git://people.freedesktop.org/~thomash/linux into...
authorDave Airlie <airlied@redhat.com>
Fri, 4 May 2018 00:03:27 +0000 (10:03 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 4 May 2018 00:03:27 +0000 (10:03 +1000)
commita02cbe2e34c576cdc5e7846a3cd55245ab81db47
tree1c0e95de8c46f07f93455ff539a4cd787b6c4f23
parent1e5fbc0b8d9d340927013bf0a271c26bb0da1d36
parent13f149d47392782baafd96d54d4e65f3b5ca342f
Merge branch 'vmwgfx-fixes-4.17' of git://people.freedesktop.org/~thomash/linux into drm-fixes

Two fixes for now, one for a long standing problem uncovered by a commit
in the 4.17 merge window, one for a regression introduced by a previous
bugfix, Cc'd stable.

* 'vmwgfx-fixes-4.17' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Fix a buffer object leak
  drm/vmwgfx: Clean up fbdev modeset locking