]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 967caf4 cb946bc)
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)
commit5f739f4d54d708a449b0bdf825ac1cb8bf863581
tree5de14abd2d8b69666d47afbfbe4d415383f784d6tree | snapshot
parent967caf43d2ca4ebb5bbbe75129eb7dc94904c97ecommit | diff
parentcb946bccd740efd57d9be49b3bccab02c0b7e116commit | diff
Merge drm/drm-next into drm-intel-gt-next

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

  49c873148c32 ("drm/i915: Fix i915_request fence wait semantics")
  000c408413e9 ("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 diff1 | diff2 | blob | history
drivers/gpu/drm/i915/gem/i915_gem_wait.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_request.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.