Merge remote-tracking branch 'drm/drm-next'

Conflicts:
	drivers/gpu/drm/drm_vm.c

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

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

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

diff --cc lib/Kconfig.debug
Simple merge