From: Dave Airlie <airlied@redhat.com>
Date: Tue, 19 Dec 2017 03:21:11 +0000 (+1000)
Subject: Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes
X-Git-Tag: v4.15-rc5~8^2~4
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=51b83e142834638d4fdb4d628ec8602b1107d91b

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

nouveau regression fixes, and some minor fixes.

* 'linux-4.15' of git://github.com/skeggsb/linux:
  drm/nouveau: use alternate memory type for system-memory buffers with kind != 0
  drm/nouveau: avoid GPU page sizes > PAGE_SIZE for buffer objects in host memory
  drm/nouveau/mmu/gp10b: use correct implementation
  drm/nouveau/pci: do a msi rearm on init
  drm/nouveau/imem/nv50: fix refcount_t warning
  drm/nouveau/bios/dp: support DP Info Table 2.0
  drm/nouveau/fbcon: fix NULL pointer access in nouveau_fbcon_destroy
---

51b83e142834638d4fdb4d628ec8602b1107d91b