== Series Details == Series: drm/i915/dmabuf: remove duplicate include in i915_gem_dmabuf.c URL : https://patchwork.freedesktop.org/series/97244/ State : failure == Summary == Applying: drm/i915/dmabuf: remove duplicate include in i915_gem_dmabuf.c Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_dmabuf.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/dmabuf: remove duplicate include in i915_gem_dmabuf.c 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".
