== Series Details == Series: series starting with [CI,01/12] drm/i915/gt: Move engine setup out of set_default_submission URL : https://patchwork.freedesktop.org/series/86639/ State : failure == Summary == Applying: drm/i915/gt: Move engine setup out of set_default_submission Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_execlists_submission.c M drivers/gpu/drm/i915/gt/intel_ring_submission.c M drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c Auto-merging drivers/gpu/drm/i915/gt/intel_ring_submission.c Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_execlists_submission.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/i915/gt: Move engine setup out of set_default_submission 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
