Merge drm/drm-next into drm-intel-gt-next
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>
Thu, 25 Nov 2021 12:47:45 +0000 (12:47 +0000)
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>
Thu, 25 Nov 2021 12:52:32 +0000 (12:52 +0000)
commit16d69a891970a8f97f0aac4e7ed0ccbf167a936b
tree5de14abd2d8b69666d47afbfbe4d415383f784d6
parent5652df829b3c2cee92bd0903a0e70455868fa1a5
parentc18c8891111bb5e014e144716044991112f16833
Merge drm/drm-next into drm-intel-gt-next

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

  7e2e69ed4678 ("drm/i915: Fix i915_request fence wait semantics")
  2cbb8d4d6770 ("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>
MAINTAINERS
drivers/gpu/drm/i915/gem/i915_gem_wait.c
drivers/gpu/drm/i915/i915_request.c