== Series Details == Series: series starting with [01/33] drm/i915: Use EAGAIN for trylock failures URL : https://patchwork.freedesktop.org/series/70833/ State : failure == Summary == Applying: drm/i915: Use EAGAIN for trylock failures Applying: drm/i915: Eliminate the trylock for awaiting an earlier request Applying: drm/i915/gt: Eliminate the trylock for reading a timeline's hwsp Applying: drm/i915/uc: Ignore maybe-unused debug-only i915 local Applying: drm/i915/gem: Prepare gen7 cmdparser for async execution Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c M drivers/gpu/drm/i915/gt/intel_gpu_commands.h M drivers/gpu/drm/i915/i915_cmd_parser.c M drivers/gpu/drm/i915/i915_drv.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_cmd_parser.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_cmd_parser.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c 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/gem: Prepare gen7 cmdparser for async execution 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
