OSDN Git Service

Backmerge tag 'v4.13-rc5' into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 15 Aug 2017 06:16:58 +0000 (16:16 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 15 Aug 2017 06:16:58 +0000 (16:16 +1000)
commit0c697fafc66830ca7d5dc19123a1d0641deaa1f6
treec56336719ca8de16f78ada78e606dffa471e47d5
parent09ef2378dc42339f3871584dc26d27da220277cb
parentef954844c7ace62f773f4f23e28d2d915adc419f
Backmerge tag 'v4.13-rc5' into drm-next

Linux 4.13-rc5

There's a really nasty nouveau collision, hopefully someone can take a look
once I pushed this out.
23 files changed:
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/si.c
drivers/gpu/drm/bridge/tc358767.c
drivers/gpu/drm/exynos/exynos_drm_drv.c
drivers/gpu/drm/exynos/exynos_drm_dsi.c
drivers/gpu/drm/exynos/exynos_drm_fb.c
drivers/gpu/drm/exynos/exynos_hdmi.c
drivers/gpu/drm/i915/gvt/scheduler.c
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/i915_perf.c
drivers/gpu/drm/i915/intel_color.c
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/selftests/mock_gem_device.c
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
drivers/gpu/drm/nouveau/nouveau_connector.c
drivers/gpu/drm/nouveau/nouveau_display.c
drivers/gpu/drm/nouveau/nv50_display.c
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c