From: Dave Airlie <airlied@redhat.com>
Date: Tue, 26 Dec 2017 23:58:57 +0000 (+1000)
Subject: Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes
X-Git-Tag: v5.15~9742^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e100ff380ce936fc1e7ae8ba16621ddf5dddffcb;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes

one nouveau regression fix

* 'linux-4.15' of git://github.com/skeggsb/linux:
  drm/nouveau: fix race when adding delayed work items
---

e100ff380ce936fc1e7ae8ba16621ddf5dddffcb