== Series Details == Series: drm/i915: Move system memory to TTM for discrete URL : https://patchwork.freedesktop.org/series/90898/ State : failure == Summary == Applying: drm/i915: Update object placement flags to be mutable Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gem/i915_gem_mman.c M drivers/gpu/drm/i915/gem/i915_gem_object.c M drivers/gpu/drm/i915/gem/i915_gem_object.h M drivers/gpu/drm/i915/gem/i915_gem_object_types.h M drivers/gpu/drm/i915/gem/i915_gem_pages.c A drivers/gpu/drm/i915/gem/i915_gem_ttm.c M drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c CONFLICT (modify/delete): drivers/gpu/drm/i915/gem/i915_gem_ttm.c deleted in HEAD and modified in drm/i915: Update object placement flags to be mutable. Version drm/i915: Update object placement flags to be mutable of drivers/gpu/drm/i915/gem/i915_gem_ttm.c left in tree. Auto-merging drivers/gpu/drm/i915/gem/i915_gem_pages.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object_types.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_object_types.h Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.h Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_object.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_mman.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_mman.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: Update object placement flags to be mutable 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
