== Series Details == Series: series starting with [01/31] drm/i915: Reduce breadcrumb lock coverage for intel_engine_enable_signaling() (rev3) URL : https://patchwork.freedesktop.org/series/10230/ State : failure == Summary == 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 Applying: drm/i915: Use engine to refer to the user's BSD intel_engine_cs Applying: drm/i915: Avoid using intel_engine_cs *ring for GPU error capture Applying: drm/i915: Remove stray intel_engine_cs ring identifiers from i915_gem.c Applying: drm/i915: Update a couple of hangcheck comments to talk about engines Applying: drm/i915: Unify intel_logical_ring_emit and intel_ring_emit Applying: drm/i915: Rename request->ringbuf to request->ring Applying: drm/i915: Rename backpointer from intel_ringbuffer to intel_engine_cs Applying: drm/i915: Rename intel_context[engine].ringbuf Applying: drm/i915: Rename struct intel_ringbuffer to struct intel_ring Applying: drm/i915: Rename residual ringbuf parameters Applying: drm/i915: Rename intel_pin_and_map_ring() Applying: drm/i915: Reduce engine->emit_flush() to a single mode parameter Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_gem_context.c M drivers/gpu/drm/i915/i915_gem_execbuffer.c M drivers/gpu/drm/i915/i915_gem_gtt.c M drivers/gpu/drm/i915/i915_gem_request.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/intel_ringbuffer.h Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c Auto-merging drivers/gpu/drm/i915/intel_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c Auto-merging drivers/gpu/drm/i915/i915_gem_request.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_request.c Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_execbuffer.c Auto-merging drivers/gpu/drm/i915/i915_gem_context.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_context.c error: Failed to merge in the changes. Patch failed at 0017 drm/i915: Reduce engine->emit_flush() to a single mode parameter 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
