BackMerge tag 'v4.15-rc4' into drm-next

Linux 4.15-rc4

Daniel requested it to fix some messy conflicts.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/base/Kconfig
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/core/dc_debug.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/core/dc_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dc_helper.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dcn10/Makefile
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h
Simple merge

diff --cc drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h
Simple merge

diff --cc drivers/gpu/drm/drm_connector.c
Simple merge

diff --cc drivers/gpu/drm/drm_mm.c
Simple merge

diff --cc drivers/gpu/drm/drm_mode_config.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/scheduler.c
Simple merge

diff --cc include/drm/drm_connector.h
Simple merge

diff --cc include/drm/drm_mode_config.h
Simple merge