Merge drm/drm-next into drm-intel-gt-next

Maarten requested a backmerge due his work depending on subtle semantic
changes introduced by:

  298c035a9c4e ("drm/i915: Fix i915_request fence wait semantics")
  f515c4b68c10 ("drm/i915: use new iterator in i915_gem_object_wait_reservation")

Both should probably have been merged to drm-intel-gt-next anyway.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --cc MAINTAINERS
Simple merge

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

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