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


Trivial merge