[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/4] drm/i915/selftests: Disable heartbeats around long queues

Patchwork patchwork at emeril.freedesktop.org
Fri Dec 6 10:07:59 UTC 2019


== Series Details ==

Series: series starting with [1/4] drm/i915/selftests: Disable heartbeats around long queues
URL   : https://patchwork.freedesktop.org/series/70556/
State : failure

== Summary ==

Applying: drm/i915/selftests: Disable heartbeats around long queues
Applying: drm/i915/selftests: Impose a timeout for request submission
Applying: drm/i915/gt: Remove direct invocation of breadcrumb signaling
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0003 drm/i915/gt: Remove direct invocation of breadcrumb signaling
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