✗ Fi.CI.BUILD: failure for series starting with [01/29] Revert "drm/i915/gem: Async GPU relocations only"
Patchwork
patchwork at emeril.freedesktop.org
Wed Aug 5 10:00:30 UTC 2020
== Series Details ==
Series: series starting with [01/29] Revert "drm/i915/gem: Async GPU relocations only"
URL : https://patchwork.freedesktop.org/series/80273/
State : failure
== Summary ==
Applying: Revert "drm/i915/gem: Async GPU relocations only"
Applying: drm/i915: Revert relocation chaining commits.
Applying: Revert "drm/i915/gem: Drop relocation slowpath".
Applying: Revert "drm/i915/gem: Split eb_vma into its own allocation"
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
Patch failed at 0004 Revert "drm/i915/gem: Split eb_vma into its own allocation"
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