commit | 7c2b134110a6af3bfe574efdb23ee04c047dc311 | [log] [tgz] |
---|---|---|
author | Dave Airlie <airlied@redhat.com> | Thu May 10 13:48:52 2018 +1000 |
committer | Dave Airlie <airlied@redhat.com> | Thu May 10 13:48:52 2018 +1000 |
tree | b3932482b9752cab8db300e9aabb9bc03b35bdf3 | |
parent | 5c0e0b45c4936295d6333dd7961d0b89b15b070d [diff] | |
parent | 352672db857290ab5b0e2b6a99c414f92bee024c [diff] |
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