[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/5] drm/i915: Add list_for_each_entry_safe_continue_reverse (rev2)
Patchwork
patchwork at emeril.freedesktop.org
Fri Jun 5 16:58:17 UTC 2020
== Series Details ==
Series: series starting with [1/5] drm/i915: Add list_for_each_entry_safe_continue_reverse (rev2)
URL : https://patchwork.freedesktop.org/series/78031/
State : failure
== Summary ==
Applying: drm/i915: Add list_for_each_entry_safe_continue_reverse
Applying: drm/i915/gem: Separate reloc validation into an earlier step
Applying: drm/i915/gem: Lift GPU relocation 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
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 drm/i915/gem: Lift GPU relocation 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
mailing list