== Series Details == Series: series starting with [01/31] drm/i915: Reduce breadcrumb lock coverage for intel_engine_enable_signaling() (rev5) URL : https://patchwork.freedesktop.org/series/10230/ State : failure == Summary == Applying: drm/i915: Reduce breadcrumb lock coverage for intel_engine_enable_signaling() Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_breadcrumbs.c Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915: Prefer list_first_entry_or_null Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_gem_gtt.c M drivers/gpu/drm/i915/i915_gem_request.c M drivers/gpu/drm/i915/i915_gem_shrinker.c Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915: Only clear the client pointer when tearing down the file Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_gem.c Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915: Only drop the batch-pool's object reference Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_gem_batch_pool.c Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915/cmdparser: Remove stray intel_engine_cs *ring Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_cmd_parser.c M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_gem_execbuffer.c M drivers/gpu/drm/i915/intel_engine_cs.c M drivers/gpu/drm/i915/intel_lrc.c M drivers/gpu/drm/i915/intel_ringbuffer.c M drivers/gpu/drm/i915/intel_ringbuffer.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 error: Failed to merge in the changes. Patch failed at 0005 drm/i915/cmdparser: Remove stray intel_engine_cs *ring The copy of the patch that failed is found in: .git/rebase-apply/patch 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
