[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [v2,3/3] HAX: Enable GuC for CI (rev4)

[Chris Wilson]

Quoting Patchwork (2018-03-22 21:52:05)
> == Series Details ==
> 
> Series: series starting with [v2,3/3] HAX: Enable GuC for CI (rev4)
> URL   : https://patchwork.freedesktop.org/series/40516/
> State : failure
> 
> == Summary ==
> 
> Applying: HAX: Enable GuC for CI
> Applying: drm/i915/uc: Fetch uC firmware in init_early
> error: Failed to merge in the changes.
> Using index info to reconstruct a base tree...
> M       drivers/gpu/drm/i915/i915_drv.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/i915_drv.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
> Patch failed at 0002 drm/i915/uc: Fetch uC firmware in init_early
> 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".

Send it afresh, pw got confused by the reply with a different series
length.
-Chris