Merge drm/drm-next into drm-misc-next
authorSean Paul <seanpaul@chromium.org>
Mon, 27 Aug 2018 14:00:03 +0000 (10:00 -0400)
committerSean Paul <seanpaul@chromium.org>
Mon, 27 Aug 2018 14:00:03 +0000 (10:00 -0400)
commitbc537a9cc47eec7f4e32b8164c494ddc35dca8ac
treea7365f3b76f4e472c43f14e074a284bfb28803e8
parenta5ec8332d4280500544e316f76c04a7adc02ce03
parent5b394b2ddf0347bef56e50c69a58773c94343ff3
Merge drm/drm-next into drm-misc-next

Now that 4.19-rc1 is cut, backmerge it into -misc-next.

Signed-off-by: Sean Paul <seanpaul@chromium.org>
12 files changed:
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
drivers/gpu/drm/drm_atomic_helper.c
drivers/gpu/drm/gma500/psb_drv.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_pipe_crc.c
drivers/gpu/drm/vc4/vc4_plane.c
drivers/gpu/drm/vkms/vkms_drv.c
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
include/drm/drm_print.h
include/uapi/drm/drm_fourcc.h