== Series Details == Series: series starting with [v5,1/7] drm/i915/ttm: add ttm_buddy_man URL : https://patchwork.freedesktop.org/series/91589/ State : failure == Summary == Applying: drm/i915/ttm: add ttm_buddy_man .git/rebase-apply/patch:845: new blank line at EOF. + warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/Makefile Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915/ttm: add i915_sg_from_buddy_resource Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_scatterlist.c M drivers/gpu/drm/i915/i915_scatterlist.h Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915/ttm: Calculate the object placement at get_pages time Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gem/i915_gem_ttm.c M drivers/gpu/drm/i915/intel_region_ttm.c M drivers/gpu/drm/i915/intel_region_ttm.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_region_ttm.h Auto-merging drivers/gpu/drm/i915/intel_region_ttm.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_ttm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_ttm.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/ttm: Calculate the object placement at get_pages time 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
