✗ Fi.CI.BUILD: failure for series starting with [01/11] drm/i915/display: Squelch kerneldoc warnings
Patchwork
patchwork at emeril.freedesktop.org
Tue Oct 15 00:33:41 UTC 2019
== Series Details ==
Series: series starting with [01/11] drm/i915/display: Squelch kerneldoc warnings
URL : https://patchwork.freedesktop.org/series/67946/
State : failure
== Summary ==
Applying: drm/i915/display: Squelch kerneldoc warnings
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_display.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915/selftests: Check known register values within the context
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/selftest_lrc.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/selftest_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_lrc.c
Patch failed at 0002 drm/i915/selftests: Check known register values within the context
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