[git pull] drm fixes for 4.15-rc6

[Dave Airlie]

Hi Linus,

Just dequeuing some fixes, I'm on holidays next week again, but I
think things should be fine.

Dave.

The following changes since commit 464e1d5f23cca236b930ef068c328a64cab78fb1:

  Linux 4.15-rc5 (2017-12-23 20:47:16 -0800)

are available in the git repository at:

  git://people.freedesktop.org/~airlied/linux tags/drm-fixes-for-v4.15-rc6

for you to fetch changes up to 03bfd4e19b935adb8be4f7342f13395fb7f11096:

  Merge tag 'drm-intel-fixes-2017-12-22-1' of
git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2017-12-28
05:20:07 +1000)

----------------------------------------------------------------
nouveau and i915 regression fixes

----------------------------------------------------------------
Ben Skeggs (1):
      drm/nouveau: fix race when adding delayed work items

Dave Airlie (2):
      Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes
      Merge tag 'drm-intel-fixes-2017-12-22-1' of
git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

Gabriel Krisman Bertazi (1):
      i915: Reject CCS modifiers for pipe C on Geminilake

Jani Nikula (1):
      Merge tag 'gvt-fixes-2017-12-21' of
https://github.com/intel/gvt-linux into drm-intel-fixes

Xiaolin Zhang (1):
      drm/i915/gvt: Fix pipe A enable as default for vgpu

 drivers/gpu/drm/i915/gvt/display.c    | 5 +++--
 drivers/gpu/drm/i915/intel_display.c  | 2 +-
 drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)