== Series Details == Series: series starting with drm/i915/selftests: Take a ref to the request we wait upon (rev3) URL : https://patchwork.freedesktop.org/series/69724/ State : failure == Summary == Applying: drm/i915/selftests: Take a ref to the request we wait upon Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c 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 M drivers/gpu/drm/i915/gt/intel_timeline_types.h 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 CONFLICT (content): Merge conflict in 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 0002 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
