== Series Details == Series: DG2 accelerated migration/clearing support (rev3) URL : https://patchwork.freedesktop.org/series/97544/ State : failure == Summary == Applying: drm/i915/gtt: allow overriding the pt alignment Applying: drm/i915/gtt: add xehpsdv_ppgtt_insert_entry Applying: drm/i915/migrate: add acceleration support for DG2 Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_migrate.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/intel_migrate.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_migrate.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0003 drm/i915/migrate: add acceleration support for DG2 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".
