Merge branch 'linux-5.1' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Fri, 22 Mar 2019 00:39:27 +0000 (10:39 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 22 Mar 2019 00:39:35 +0000 (10:39 +1000)
commitcd845791125059d94de5b2e8921039bf21ea46f7
tree8a951d0a983ce81dec45466bff5434c882ea3224
parent8f3b487685b2acf71b42bb30d68fd9271bec8695
parent83857418073fda5e0d562e6639b45ae06c957131
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
drivers/gpu/drm/nouveau/nouveau_dmem.c