From: Dave Airlie <airlied@redhat.com>
Date: Thu, 10 May 2018 03:48:52 +0000 (+1000)
Subject: Merge branch 'linux-4.17' of git://github.com/skeggsb/linux into drm-fixes
X-Git-Tag: v4.17-rc5~20^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7c2b134110a6af3bfe574efdb23ee04c047dc311;p=users%2Fdwmw2%2Flinux.git

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
---

7c2b134110a6af3bfe574efdb23ee04c047dc311