== Series Details == Series: series starting with [01/18] drm/i915: Unify intel_logical_ring_emit and intel_ring_emit (rev4) URL : https://patchwork.freedesktop.org/series/10090/ State : failure == Summary == Applying: drm/i915: Unify intel_logical_ring_emit and intel_ring_emit Applying: drm/i915: Convert stray struct intel_engine_cs *ring Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_gem_execbuffer.c M drivers/gpu/drm/i915/intel_mocs.h 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/i915_gem_execbuffer.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_execbuffer.c Auto-merging drivers/gpu/drm/i915/i915_drv.h error: Failed to merge in the changes. Patch failed at 0002 drm/i915: Convert stray struct 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
