== Series Details == Series: Splitting intel-gtt calls for non-x86 platforms (rev4) URL : https://patchwork.freedesktop.org/series/101552/ State : failure == Summary == Applying: drm/i915/gt: Split intel-gtt functions by arch Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/Makefile M drivers/gpu/drm/i915/gt/intel_ggtt.c M drivers/gpu/drm/i915/gt/intel_gt.c M drivers/gpu/drm/i915/gt/intel_gt.h M drivers/gpu/drm/i915/gt/intel_gtt.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/intel_gtt.h Auto-merging drivers/gpu/drm/i915/gt/intel_gt.h Auto-merging drivers/gpu/drm/i915/gt/intel_gt.c Auto-merging drivers/gpu/drm/i915/gt/intel_ggtt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_ggtt.c Auto-merging drivers/gpu/drm/i915/Makefile 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/gt: Split intel-gtt functions by arch 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".
