== Series Details == Series: series starting with [01/19] drm/i915/selftests: Force bonded submission to overlap (rev2) URL : https://patchwork.freedesktop.org/series/69647/ State : failure == Summary == Applying: drm/i915/selftests: Force bonded submission to overlap Applying: drm/i915/gem: Manually dump the debug trace on GEM_BUG_ON Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_gem.h Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915/gt: Close race between engine_park and intel_gt_retire_requests Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_gt_requests.c M drivers/gpu/drm/i915/gt/intel_timeline.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/intel_timeline.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_timeline.c Auto-merging drivers/gpu/drm/i915/gt/intel_gt_requests.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0003 drm/i915/gt: Close race between engine_park and intel_gt_retire_requests When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
