== Series Details == Series: dicsrete card 64K page support URL : https://patchwork.freedesktop.org/series/98758/ State : failure == Summary == Applying: drm/i915: enforce min GTT alignment for discrete cards Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_gtt.c M drivers/gpu/drm/i915/gt/intel_gtt.h M drivers/gpu/drm/i915/i915_vma.c M drivers/gpu/drm/i915/selftests/i915_gem_gtt.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/selftests/i915_gem_gtt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/i915_gem_gtt.c Auto-merging drivers/gpu/drm/i915/i915_vma.c Auto-merging drivers/gpu/drm/i915/gt/intel_gtt.h Auto-merging drivers/gpu/drm/i915/gt/intel_gtt.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: enforce min GTT alignment for discrete cards 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".
