[Intel-gfx] ✗ Fi.CI.BUILD: failure for Add GuC Error Capture Support (rev6)
patchwork at emeril.freedesktop.org
Sat Feb 26 06:20:58 UTC 2022
== Series Details ==
Series: Add GuC Error Capture Support (rev6)
URL : https://patchwork.freedesktop.org/series/97187/
State : failure
== Summary ==
Applying: drm/i915/guc: Update GuC ADS size for error capture lists
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/gt/uc/intel_guc_ads.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 drm/i915/guc: Update GuC ADS size for error capture lists
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