✗ Fi.CI.BAT: failure for series starting with [01/28] drm/i915/selftests: Split preemption smoke test into threads
Patchwork
patchwork at emeril.freedesktop.org
Mon Oct 1 19:03:30 UTC 2018
== Series Details ==
Series: series starting with [01/28] drm/i915/selftests: Split preemption smoke test into threads
URL : https://patchwork.freedesktop.org/series/50326/
State : failure
== Summary ==
Applying: drm/i915/selftests: Split preemption smoke test into threads
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/selftests/intel_lrc.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/selftests/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/intel_lrc.c
Patch failed at 0001 drm/i915/selftests: Split preemption smoke test into threads
Use 'git am --show-current-patch' to see the failed 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