== Series Details == Series: drm/i915: Don't use BAR mappings for ring buffers with LLC (rev3) URL : https://patchwork.freedesktop.org/series/115090/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/115090/revisions/3/mbox/ not applied Applying: drm/i915: Don't use BAR mappings for ring buffers with LLC Using index info to reconstruct a base tree... A drivers/gpu/drm/i915/gt/intel_ringbuffer.c Falling back to patching base and 3-way merge... CONFLICT (modify/delete): drivers/gpu/drm/i915/gt/intel_ringbuffer.c deleted in HEAD and modified in drm/i915: Don't use BAR mappings for ring buffers with LLC. Version drm/i915: Don't use BAR mappings for ring buffers with LLC of drivers/gpu/drm/i915/gt/intel_ringbuffer.c left in tree. error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/i915: Don't use BAR mappings for ring buffers with LLC 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".
