Backmerge tag 'v4.14-rc7' into drm-next
authorDave Airlie <airlied@redhat.com>
Thu, 2 Nov 2017 02:40:41 +0000 (12:40 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 2 Nov 2017 02:40:41 +0000 (12:40 +1000)
commit7a88cbd8d65d622c00bd76ba4ae1d893b292c91c
tree826df7ac42ca13c33828d0142046186b91df686b
parent0a4334c9e5405f836c46375c6e279cfdda7da6b5
parent0b07194bb55ed836c2cc7c22e866b87a14681984
Backmerge tag 'v4.14-rc7' into drm-next

Linux 4.14-rc7

Requested by Ben Skeggs for nouveau to avoid major conflicts,
and things were getting a bit conflicty already, esp around amdgpu
reverts.
18 files changed:
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
drivers/gpu/drm/i915/gvt/cmd_parser.c
drivers/gpu/drm/i915/gvt/execlist.c
drivers/gpu/drm/i915/gvt/scheduler.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_evict.c
drivers/gpu/drm/i915/i915_perf.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_bios.c
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_engine_cs.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/msm/dsi/dsi_host.c
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
drivers/gpu/drm/msm/msm_gem.c
drivers/gpu/drm/msm/msm_rd.c