Merge branch 'linux-4.17' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Thu, 10 May 2018 03:48:52 +0000 (13:48 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 10 May 2018 03:48:52 +0000 (13:48 +1000)
Two nouveau crasher/deadlock fixes.

* 'linux-4.17' of git://github.com/skeggsb/linux:
  drm/nouveau: Fix deadlock in nv50_mstm_register_connector()
  drm/nouveau/ttm: don't dereference nvbo::cli, it can outlive client


Trivial merge