Merge tag 'v4.11-rc7' into drm-next

Backmerge Linux 4.11-rc7 from Linus tree, to fix some
conflicts that were causing problems with the rerere cache
in drm-tip.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/etnaviv/etnaviv_gpu.c
Simple merge

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

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

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

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

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

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

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

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