[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: Futher optimize plane updates (rev2)
patchwork at emeril.freedesktop.org
Wed Feb 9 16:14:13 UTC 2022
== Series Details ==
Series: drm/i915: Futher optimize plane updates (rev2)
URL : https://patchwork.freedesktop.org/series/99149/
State : failure
== Summary ==
Applying: drm/i915: Clean up pre-skl primary plane registers
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/display.c
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: Clean up pre-skl primary plane 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