[igt-dev] ✗ Fi.CI.BUILD: failure for vram d3cold threshold test (rev6)

[Patchwork]

== Series Details ==

Series: vram d3cold threshold test (rev6)
URL   : https://patchwork.freedesktop.org/series/119914/
State : failure

== Summary ==

Applying: lib/igt_kms: Add helper to turn on and off the displays
Applying: tests/xe_pm : Add support to disable all crtc
Using index info to reconstruct a base tree...
A	tests/xe/xe_pm.c
Falling back to patching base and 3-way merge...
Auto-merging tests/intel/xe_pm.c
Applying: test/xe_pm: Add vram_d3cold_threshold subtest
Using index info to reconstruct a base tree...
A	tests/xe/xe_pm.c
Falling back to patching base and 3-way merge...
Auto-merging tests/intel/xe_pm.c
CONFLICT (content): Merge conflict in tests/intel/xe_pm.c
Patch failed at 0003 test/xe_pm: Add vram_d3cold_threshold subtest
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".