== Series Details == Series: GuC submission support (rev2) URL : https://patchwork.freedesktop.org/series/91840/ State : failure == Summary == Applying: drm/i915/guc: Relax CTB response timeout Applying: drm/i915/guc: Improve error message for unsolicited CT response Applying: drm/i915/guc: Increase size of CTB buffers Applying: drm/i915/guc: Add non blocking CTB send function Applying: drm/i915/guc: Add stall timer to non blocking CTB send function Applying: drm/i915/guc: Optimize CTB writes and reads Applying: drm/i915/guc: Module load failure test for CT buffer creation Applying: drm/i915/guc: Add new GuC interface defines and structures Applying: drm/i915/guc: Remove GuC stage descriptor, add lrc descriptor Applying: drm/i915/guc: Add lrc descriptor context lookup array Applying: drm/i915/guc: Implement GuC submission tasklet Applying: drm/i915/guc: Add bypass tasklet submission path to GuC Applying: drm/i915/guc: Implement GuC context operations for new inteface Applying: drm/i915/guc: Insert fence on context when deregistering Applying: drm/i915/guc: Defer context unpin until scheduling is disabled Applying: drm/i915/guc: Disable engine barriers with GuC during unpin Applying: drm/i915/guc: Extend deregistration fence to schedule disable Applying: drm/i915: Disable preempt busywait when using GuC scheduling Applying: drm/i915/guc: Ensure request ordering via completion fences Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_request.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_request.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0019 drm/i915/guc: Ensure request ordering via completion fences 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
