[Intel-gfx] ✗ Fi.CI.BUILD: failure for RFC: i915: Drop relocation support on Gen12+
patchwork at emeril.freedesktop.org
Thu May 7 16:27:52 UTC 2020
== Series Details ==
Series: RFC: i915: Drop relocation support on Gen12+
URL : https://patchwork.freedesktop.org/series/77048/
State : failure
== Summary ==
Applying: RFC: i915: Drop relocation support on Gen12+
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
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 0001 RFC: i915: Drop relocation support on Gen12+
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