✗ Fi.CI.BUILD: failure for ttm for stolen backend

Patchwork patchwork at emeril.freedesktop.org
Tue Mar 22 03:57:14 UTC 2022


== Series Details ==

Series: ttm for stolen backend
URL   : https://patchwork.freedesktop.org/series/101609/
State : failure

== Summary ==

Applying: drm/i915: instantiate ttm ranger manager for stolen memory
Applying: drm/i915: add ability to create memory region object in place
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gem/i915_gem_region.c
M	drivers/gpu/drm/i915/gem/i915_gem_region.h
M	drivers/gpu/drm/i915/gem/i915_gem_ttm.c
M	drivers/gpu/drm/i915/intel_memory_region.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_memory_region.h
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/i915/gem/i915_gem_region.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_region.h
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_region.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_region.c
Patch failed at 0002 drm/i915: add ability to create memory region object in place
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-trybot mailing list