== Series Details == Series: series starting with [v5,01/13] drm/ttm: stop calling tt_swapin in vm_access (rev2) URL : https://patchwork.freedesktop.org/series/95093/ State : failure == Summary == Applying: drm/ttm: stop calling tt_swapin in vm_access Using index info to reconstruct a base tree... M drivers/gpu/drm/ttm/ttm_bo_vm.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c No changes -- Patch already applied. Applying: drm/ttm: stop setting page->index for the ttm_tt Using index info to reconstruct a base tree... M drivers/gpu/drm/ttm/ttm_bo_vm.c M drivers/gpu/drm/ttm/ttm_tt.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/ttm/ttm_tt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_tt.c Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 drm/ttm: stop setting page->index for the ttm_tt 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".
