From: Dave Airlie <airlied@redhat.com>
Date: Fri, 22 Mar 2019 00:39:27 +0000 (+1000)
Subject: Merge branch 'linux-5.1' of git://github.com/skeggsb/linux into drm-fixes
X-Git-Tag: v5.1-rc2~23^2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cd845791125059d94de5b2e8921039bf21ea46f7;p=linux.git

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

Some minor nouveau dmem and other fixes.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <bskeggs@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CABDvA==kMkD6n-cS9KpQBcTU1E8p7Wc+H1ZuOhSfD7yTFJVvkw@mail.gmail.com
---

cd845791125059d94de5b2e8921039bf21ea46f7