✗ Fi.CI.BUILD: failure for drm/i915/ttm: remove shmem memory region and gem object backend (rev2)
Patchwork
patchwork at emeril.freedesktop.org
Thu Mar 3 03:38:31 UTC 2022
== Series Details ==
Series: drm/i915/ttm: remove shmem memory region and gem object backend (rev2)
URL : https://patchwork.freedesktop.org/series/100763/
State : failure
== Summary ==
Applying: drm/i915/ttm: remove shmem memory region and gem object backend
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_fbdev.c
M drivers/gpu/drm/i915/gem/i915_gem_object.c
M drivers/gpu/drm/i915/gem/i915_gem_shmem.c
M drivers/gpu/drm/i915/gem/i915_gem_ttm.c
M drivers/gpu/drm/i915/gem/selftests/huge_pages.c
M drivers/gpu/drm/i915/gt/intel_lrc.c
M drivers/gpu/drm/i915/gt/shmem_utils.c
M drivers/gpu/drm/i915/intel_memory_region.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/intel_memory_region.c
Auto-merging drivers/gpu/drm/i915/gt/shmem_utils.c
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
Auto-merging drivers/gpu/drm/i915/gem/selftests/huge_pages.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_ttm.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shmem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_shmem.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.c
Auto-merging drivers/gpu/drm/i915/display/intel_fbdev.c
Patch failed at 0001 drm/i915/ttm: remove shmem memory region and gem object backend
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