]> git.baikalelectronics.ru Git - kernel.git/commit
BackMerge tag 'v4.15-rc4' into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 19 Dec 2017 11:37:24 +0000 (21:37 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 19 Dec 2017 11:37:24 +0000 (21:37 +1000)
commit3347f2e3a95193d7923c7842d103842244306eef
tree6a4c1e30e5900626e506d46b100d21a2fcd59003
parentf3541de73bebf7acb02446a4e15f6d54ec5433cc
parentf46f7a864ffeb8668eeb7ce6a8595148d52edaeb
BackMerge tag 'v4.15-rc4' into drm-next

Linux 4.15-rc4

Daniel requested it to fix some messy conflicts.
17 files changed:
MAINTAINERS
drivers/base/Kconfig
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
drivers/gpu/drm/amd/display/dc/core/dc_debug.c
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
drivers/gpu/drm/amd/display/dc/dc_helper.c
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
drivers/gpu/drm/amd/display/dc/dcn10/Makefile
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h
drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h
drivers/gpu/drm/drm_connector.c
drivers/gpu/drm/drm_mm.c
drivers/gpu/drm/drm_mode_config.c
drivers/gpu/drm/exynos/exynos_drm_drv.c
drivers/gpu/drm/i915/gvt/scheduler.c
include/drm/drm_connector.h
include/drm/drm_mode_config.h