[Intel-gfx] ✗ Fi.CI.BAT: failure for docs: fix, intel_guc_loader.c has been moved to intel_guc_fw.c

Patchwork patchwork at emeril.freedesktop.org
Tue Dec 12 13:03:15 UTC 2017


== Series Details ==

Series: docs: fix, intel_guc_loader.c has been moved to intel_guc_fw.c
URL   : https://patchwork.freedesktop.org/series/35221/
State : failure

== Summary ==

Applying: docs: fix, intel_guc_loader.c has been moved to intel_guc_fw.c
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 docs: fix, intel_guc_loader.c has been moved to intel_guc_fw.c
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