✗ Fi.CI.BUILD: failure for series starting with [2/2] Enable PXP configs for CI (rev3)

Patchwork patchwork at emeril.freedesktop.org
Wed Dec 22 00:22:18 UTC 2021


== Series Details ==

Series: series starting with [2/2] Enable PXP configs for CI (rev3)
URL   : https://patchwork.freedesktop.org/series/98274/
State : failure

== Summary ==

Applying: Enable PXP configs for CI
Applying: Enable PXP configs for CI
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/Kconfig.debug
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/Kconfig.debug
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Kconfig.debug
Patch failed at 0002 Enable PXP configs for CI
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