[Intel-gfx] ✗ Fi.CI.BAT: failure for Documentation patch for batchbuffer submission (rev4)
Patchwork
patchwork at emeril.freedesktop.org
Tue Apr 3 12:19:56 UTC 2018
== Series Details ==
Series: Documentation patch for batchbuffer submission (rev4)
URL : https://patchwork.freedesktop.org/series/38433/
State : failure
== Summary ==
Applying: i915.rst: Narration overview on GEM + minor reorder to improve narration
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M Documentation/gpu/i915.rst
Falling back to patching base and 3-way merge...
Auto-merging Documentation/gpu/i915.rst
CONFLICT (content): Merge conflict in Documentation/gpu/i915.rst
Patch failed at 0001 i915.rst: Narration overview on GEM + minor reorder to improve narration
The copy of the patch that failed is found in: .git/rebase-apply/patch
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