== Series Details ==
Series: drm/i915/breadcrumbs: Ignore unsubmitted signalers (rev2)
URL : https://patchwork.freedesktop.org/series/37724/
State : failure
== Summary ==
Applying: drm/i915/breadcrumbs: Ignore unsubmitted signalers
error: Failed to merge in the changes.
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/intel_breadcrumbs.c
Patch failed at 0001 drm/i915/breadcrumbs: Ignore unsubmitted signalers
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".
Intel-gfx mailing list