[Intel-gfx] ✗ Fi.CI.BUILD: failure for add support for GSC in XeHP SDV platform

Patchwork patchwork at emeril.freedesktop.org
Tue Feb 22 13:52:42 UTC 2022


== Series Details ==

Series: add support for GSC in XeHP SDV platform
URL   : https://patchwork.freedesktop.org/series/100560/
State : failure

== Summary ==

Applying: drm/i915/gsc: skip irq initialization if using polling
Using index info to reconstruct a base tree...
A	drivers/gpu/drm/i915/gt/intel_gsc.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): drivers/gpu/drm/i915/gt/intel_gsc.c deleted in HEAD and modified in drm/i915/gsc: skip irq initialization if using polling. Version drm/i915/gsc: skip irq initialization if using polling of drivers/gpu/drm/i915/gt/intel_gsc.c left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/gsc: skip irq initialization if using polling
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 mailing list