[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [CI,DO_NOT_MERGE,1/3] drm/i915/mtl: do not enable render power-gating on MTL (rev2)
Patchwork
patchwork at emeril.freedesktop.org
Thu May 18 18:44:46 UTC 2023
== Series Details ==
Series: series starting with [CI,DO_NOT_MERGE,1/3] drm/i915/mtl: do not enable render power-gating on MTL (rev2)
URL : https://patchwork.freedesktop.org/series/117912/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/117912/revisions/2/mbox/ not applied
Applying: drm/i915/mtl: do not enable render power-gating on MTL
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/intel_rc6.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_rc6.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_rc6.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/mtl: do not enable render power-gating on MTL
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
mailing list