✗ Ro.CI.BAT: failure for Add debugging for failed GuC firmware load
Patchwork
patchwork at emeril.freedesktop.org
Sat Jul 23 06:01:17 UTC 2016
== Series Details ==
Series: Add debugging for failed GuC firmware load
URL : https://patchwork.freedesktop.org/series/10200/
State : failure
== Summary ==
Applying: Add debugging for failed GuC firmware load
Applying: drm/i915/guc: symbolic names for GuC firmare loading preferences
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_guc.h
M drivers/gpu/drm/i915/intel_guc_loader.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_guc_loader.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_guc_loader.c
Auto-merging drivers/gpu/drm/i915/intel_guc.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_guc.h
error: Failed to merge in the changes.
Patch failed at 0002 drm/i915/guc: symbolic names for GuC firmare loading preferences
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-trybot
mailing list