== Series Details == Series: add guard padding around i915_vma URL : https://patchwork.freedesktop.org/series/110720/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/110720/revisions/1/mbox/ not applied Applying: drm/i915: Wrap all access to i915_vma.node.start|size Applying: drm/i915: Introduce guard pages to i915_vma Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_vma.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_vma.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_vma.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 drm/i915: Introduce guard pages to i915_vma 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".
