From: Dave Airlie <airlied@redhat.com>
Date: Wed, 1 Nov 2017 00:05:03 +0000 (+1000)
Subject: Merge branch 'linux-4.14' of git://github.com/skeggsb/linux into drm-fixes
X-Git-Tag: v4.14-rc8~17^2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=25dd1aa3b4cf0c361147aa45ff4dd1d335259ac1;p=linux-block.git

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

25dd1aa3b4cf0c361147aa45ff4dd1d335259ac1