== Series Details == Series: series starting with [v6,1/6] drm/ttm: Add new callbacks to ttm res mgr URL : https://patchwork.freedesktop.org/series/107528/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/107528/revisions/1/mbox/ not applied Applying: drm/ttm: Add new callbacks to ttm res mgr Using index info to reconstruct a base tree... M drivers/gpu/drm/ttm/ttm_bo.c M drivers/gpu/drm/ttm/ttm_resource.c M include/drm/ttm/ttm_resource.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/ttm/ttm_resource.c CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_resource.c Auto-merging drivers/gpu/drm/ttm/ttm_bo.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: Add new callbacks to ttm res mgr 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".
