[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/3] drm/ttm: s/FLAG_SG/FLAG_EXTERNAL/
Patchwork
patchwork at emeril.freedesktop.org
Wed Sep 29 13:34:18 UTC 2021
== Series Details ==
Series: series starting with [1/3] drm/ttm: s/FLAG_SG/FLAG_EXTERNAL/
URL : https://patchwork.freedesktop.org/series/95219/
State : failure
== Summary ==
Applying: drm/ttm: s/FLAG_SG/FLAG_EXTERNAL/
Using index info to reconstruct a base tree...
M drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
M drivers/gpu/drm/i915/gem/i915_gem_ttm.c
M drivers/gpu/drm/nouveau/nouveau_bo.c
M drivers/gpu/drm/ttm/ttm_bo_util.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/ttm/ttm_bo_util.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo_util.c
Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.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
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: s/FLAG_SG/FLAG_EXTERNAL/
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".
More information about the Intel-gfx
mailing list