== Series Details == Series: series starting with [1/5] drm/i915: Only enqueue already completed requests URL : https://patchwork.freedesktop.org/series/64781/ State : failure == Summary == Applying: drm/i915: Only enqueue already completed requests Applying: drm/i915/execlists: Force preemption Applying: drm/i915: Mark up "sentinel" requests Applying: drm/i915/execlists: Cancel banned contexts on schedule-out Applying: drm/i915: Cancel non-persistent contexts on close Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/Makefile M drivers/gpu/drm/i915/gem/i915_gem_context.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_context.c Auto-merging drivers/gpu/drm/i915/Makefile CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Makefile error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0005 drm/i915: Cancel non-persistent contexts on close 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
