Merge branch 'linux-4.19' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Thu, 13 Sep 2018 23:38:35 +0000 (09:38 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 13 Sep 2018 23:38:42 +0000 (09:38 +1000)
One more nouveau fix to remove some debug warnings.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <bskeggs@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CABDvA==GF63dy8a9j611=-0x8G6FRu7uC-ZQypsLO_hqV4OAcA@mail.gmail.com

Trivial merge