== Series Details == Series: series starting with [1/4] drm/i915: Replace some open-coded i915_map_coherent_type() (rev3) URL : https://patchwork.freedesktop.org/series/50408/ State : failure == Summary == Applying: drm/i915: Replace some open-coded i915_map_coherent_type() Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_ringbuffer.c M drivers/gpu/drm/i915/selftests/intel_hangcheck.c M drivers/gpu/drm/i915/selftests/intel_lrc.c Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915: Handle incomplete Z_FINISH for compressed error states Applying: drm/i915: Clear the error PTE just once on finish Applying: drm/i915: Cache the error string Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_debugfs.c M drivers/gpu/drm/i915/i915_gpu_error.c M drivers/gpu/drm/i915/i915_gpu_error.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_gpu_error.h Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gpu_error.c Auto-merging drivers/gpu/drm/i915/i915_debugfs.c error: Failed to merge in the changes. Patch failed at 0004 drm/i915: Cache the error string Use 'git am --show-current-patch' to see the failed 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
