Merge remote branch 'origin/drm-core-next' into test

Conflicts:
	drivers/gpu/drm/drm_fb_helper.c

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

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

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

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

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

diff --cc drivers/gpu/drm/ttm/ttm_tt.c
Simple merge