]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit7d262212bcde7f20d74f0c81f29af98a208d3d34
tree5de14abd2d8b69666d47afbfbe4d415383f784d6
parentd00eca50702b827f5719c610377b62b808a4a395
parent1daef962e3e560f30e59d41a133bf5936d5999b8
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>
MAINTAINERS
drivers/gpu/drm/i915/gem/i915_gem_wait.c
drivers/gpu/drm/i915/i915_request.c