== Series Details == Series: drm/ttm: rework on ttm_resource to use size_t type (rev2) URL : https://patchwork.freedesktop.org/series/110129/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/110129/revisions/2/mbox/ not applied Applying: drm/ttm: rework on ttm_resource to use size_t type Using index info to reconstruct a base tree... M drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c M drivers/gpu/drm/amd/amdgpu/amdgpu_object.c M drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h M drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h M drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c M drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c M drivers/gpu/drm/i915/gem/i915_gem_ttm.c M drivers/gpu/drm/i915/i915_scatterlist.c M drivers/gpu/drm/i915/i915_ttm_buddy_manager.c M drivers/gpu/drm/i915/intel_region_ttm.c M drivers/gpu/drm/nouveau/nouveau_bo.c M drivers/gpu/drm/nouveau/nouveau_bo0039.c M drivers/gpu/drm/nouveau/nouveau_bo5039.c M drivers/gpu/drm/nouveau/nouveau_bo74c1.c M drivers/gpu/drm/nouveau/nouveau_bo85b5.c M drivers/gpu/drm/nouveau/nouveau_bo9039.c M drivers/gpu/drm/nouveau/nouveau_bo90b5.c M drivers/gpu/drm/nouveau/nouveau_boa0b5.c M drivers/gpu/drm/nouveau/nouveau_gem.c M drivers/gpu/drm/nouveau/nouveau_mem.c M drivers/gpu/drm/nouveau/nouveau_ttm.c M drivers/gpu/drm/radeon/radeon_cs.c M drivers/gpu/drm/radeon/radeon_object.c M drivers/gpu/drm/radeon/radeon_trace.h M drivers/gpu/drm/radeon/radeon_ttm.c M drivers/gpu/drm/ttm/ttm_bo.c M drivers/gpu/drm/ttm/ttm_bo_util.c M drivers/gpu/drm/ttm/ttm_bo_vm.c M drivers/gpu/drm/ttm/ttm_range_manager.c M drivers/gpu/drm/ttm/ttm_resource.c M drivers/gpu/drm/vmwgfx/vmwgfx_blit.c M drivers/gpu/drm/vmwgfx/vmwgfx_bo.c M drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c M drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c M drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c M drivers/gpu/drm/vmwgfx/vmwgfx_kms.c M drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c M include/drm/ttm/ttm_resource.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_kms.c CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_kms.c Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_bo.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_ttm.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_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 0001 drm/ttm: rework on ttm_resource to use size_t type 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".
