Merge tag 'v4.10-rc2' into drm-intel-next-queued

Backmerge Linux 4.10-rc2 to resync with our -fixes cherry-picks. I've
done the backmerge directly because Dave is on vacation.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

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

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

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

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

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

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