== Series Details == Series: drm/i915: Don't use stolen memory for ring buffers with LLC (rev5) URL : https://patchwork.freedesktop.org/series/115334/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/115334/revisions/5/mbox/ not applied Applying: drm/i915: Don't use stolen memory for ring buffers with LLC Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_ring.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/intel_ring.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_ring.c 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 stolen memory 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". Build failed, no error log produced
