✗ Fi.CI.BAT: failure for series starting with [01/52] drm/i915/selftests: Verify whitelist of context registers
Patchwork
patchwork at emeril.freedesktop.org
Wed Apr 24 18:58:36 UTC 2019
== Series Details ==
Series: series starting with [01/52] drm/i915/selftests: Verify whitelist of context registers
URL : https://patchwork.freedesktop.org/series/59868/
State : failure
== Summary ==
Applying: drm/i915/selftests: Verify whitelist of context registers
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/selftests/intel_workarounds.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/selftests/intel_workarounds.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/intel_workarounds.c
Patch failed at 0001 drm/i915/selftests: Verify whitelist of context registers
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