== Series Details == Series: drm/i915: clean up i915_drv.h, part 2 (rev3) URL : https://patchwork.freedesktop.org/series/98691/ State : failure == Summary == Applying: drm/i915: split out i915_gem.h declarations from i915_drv.h Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drv.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h 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: split out i915_gem.h declarations from i915_drv.h 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".