✗ Fi.CI.BUILD: failure for series starting with [01/10] drm/i915/gt: Cleanup aux invalidation registers

Patchwork patchwork at emeril.freedesktop.org
Mon Jul 24 19:36:03 UTC 2023


== Series Details ==

Series: series starting with [01/10] drm/i915/gt: Cleanup aux invalidation registers
URL   : https://patchwork.freedesktop.org/series/121230/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/121230/revisions/1/mbox/ not applied
Applying: drm/i915/gt: Cleanup aux invalidation registers
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/gen8_engine_cs.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/gen8_engine_cs.c
Applying: drm/i915: Add the gen12_needs_ccs_aux_inv helper
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/gen8_engine_cs.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/gen8_engine_cs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/gen8_engine_cs.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 drm/i915: Add the gen12_needs_ccs_aux_inv helper
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".
Build failed, no error log produced




More information about the Intel-gfx-trybot mailing list