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)
commit7c2b134110a6af3bfe574efdb23ee04c047dc311
treeb3932482b9752cab8db300e9aabb9bc03b35bdf3
parent5c0e0b45c4936295d6333dd7961d0b89b15b070d
parent352672db857290ab5b0e2b6a99c414f92bee024c
Merge branch 'linux-4.17' of git://github.com/skeggsb/linux into drm-fixes

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