Merge v4.18-rc3 into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 4 Jul 2018 00:27:12 +0000 (10:27 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 4 Jul 2018 00:27:12 +0000 (10:27 +1000)
commitf29135ee4e0d4e01911ed569f731bfdb841cea6d
treee72d49a2f677dd069c3a673522cf785548148f71
parenteab976693153b9854bfa83d131374748f6ca4280
parent021c91791a5e7e85c567452f1be3e4c2c6cb6063
Merge v4.18-rc3 into drm-next

Two requests have come in for a backmerge,
and I've got some pull reqs on rc2, so this
just makes sense.

Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/sun4i/sun4i_tcon.c