== Series Details == Series: series starting with [01/10] drm/i915: Note the addition of timeslicing to the pretend scheduler (rev2) URL : https://patchwork.freedesktop.org/series/67827/ State : failure == Summary == Applying: drm/i915: Note the addition of timeslicing to the pretend scheduler Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_scheduler_types.h Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915/execlists: Leave tell-tales as to why pending[] is bad Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_lrc.c M drivers/gpu/drm/i915/i915_gem.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_gem.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.h Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.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/execlists: Leave tell-tales as to why pending[] is bad 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
