== Series Details == Series: drm/i915: GTT remapping for display (rev5) URL : https://patchwork.freedesktop.org/series/55415/ State : failure == Summary == Applying: drm/i915: Add a new "remapped" gtt_view Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_debugfs.c M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_gem.c M drivers/gpu/drm/i915/intel_display.c M drivers/gpu/drm/i915/intel_drv.h M drivers/gpu/drm/i915/selftests/i915_vma.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/selftests/i915_vma.c Auto-merging drivers/gpu/drm/i915/intel_drv.h Auto-merging drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/gpu/drm/i915/i915_gem.c Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/i915_debugfs.c Applying: drm/i915/selftests: Add mock selftest for remapped vmas Applying: drm/i915/selftests: Add live vma selftest Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_display.c M drivers/gpu/drm/i915/selftests/i915_vma.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/selftests/i915_vma.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/i915_vma.c Auto-merging drivers/gpu/drm/i915/intel_display.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0003 drm/i915/selftests: Add live vma selftest 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". _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
