== Series Details == Series: series starting with drm/i915: Complete the fences as they are cancelled due to wedging (rev2) URL : https://patchwork.freedesktop.org/series/53308/ State : failure == Summary == Applying: drm/i915: Complete the fences as they are cancelled due to wedging Applying: drm/i915/ringbuffer: Clear semaphore sync registers on ring init Applying: drm/i915: Allocate a common scratch page Applying: drm/i915/selftests: Terminate hangcheck sanitycheck forcibly Applying: drm/i915/selftests: Reorder request allocation vs vma pinning Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/selftests/intel_lrc.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/selftests/intel_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/intel_lrc.c error: Failed to merge in the changes. Patch failed at 0005 drm/i915/selftests: Reorder request allocation vs vma pinning Use 'git am --show-current-patch' to see the failed patch 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
