== Series Details == Series: series starting with [1/5] drm/i915/gt: Wait for new requests in intel_gt_retire_requests() (rev2) URL : https://patchwork.freedesktop.org/series/69497/ State : failure == Summary == Applying: drm/i915/gt: Wait for new requests in intel_gt_retire_requests() Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_gt_requests.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/intel_gt_requests.c No changes -- Patch already applied. Applying: drm/i915/selftests: Exercise rc6 handling Applying: drm/i915/selftests: Be explicit in ERR_PTR handling Applying: drm/i915/selftests: Exercise long preemption chains Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/selftest_lrc.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/selftest_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_lrc.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0004 drm/i915/selftests: Exercise long preemption chains 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
