Merge tag 'v4.10-rc2' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 4 Jan 2017 10:34:01 +0000 (11:34 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 4 Jan 2017 10:35:18 +0000 (11:35 +0100)
commita402eae64d0ad12b1c4a411f250d6c161e67f623
tree8c031c914e29321c01b94497a0f9c49ee6b03dc4
parent7800fb69ddf3a13d2055009c87eacf7f46f907c8
parent0c744ea4f77d72b3dcebb7a8f2684633ec79be88
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>
drivers/gpu/drm/i915/gvt/scheduler.c
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_request.c
drivers/gpu/drm/i915/i915_gem_userptr.c
drivers/gpu/drm/i915/intel_dsi.c
drivers/gpu/drm/i915/intel_uncore.c