Merge branch 'linux-4.14' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Wed, 1 Nov 2017 00:05:03 +0000 (10:05 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 1 Nov 2017 00:05:03 +0000 (10:05 +1000)
commit25dd1aa3b4cf0c361147aa45ff4dd1d335259ac1
tree47111c1e2c74ecff6683d38be614c40e93baf53a
parent0b07194bb55ed836c2cc7c22e866b87a14681984
parentd324c5bc462d354d337dcf3a14ffd0eb17b4fa38
Merge branch 'linux-4.14' of git://github.com/skeggsb/linux into drm-fixes

single nouveau regression fix.

* 'linux-4.14' of git://github.com/skeggsb/linux:
  drm/nouveau/kms/nv50: use the correct state for base channel notifier setup