[igt-dev] ✗ Fi.CI.BUILD: failure for Revert "tests/amdgpu: Add test for ODM combine"

[Patchwork]

== Series Details ==

Series: Revert "tests/amdgpu: Add test for ODM combine"
URL   : https://patchwork.freedesktop.org/series/122762/
State : failure

== Summary ==

Applying: Revert "tests/amdgpu: Add test for ODM combine"
Using index info to reconstruct a base tree...
M	tests/amdgpu/amd_odm.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): tests/amdgpu/amd_odm.c deleted in Revert "tests/amdgpu: Add test for ODM combine" and modified in HEAD. Version HEAD of tests/amdgpu/amd_odm.c left in tree.
Patch failed at 0001 Revert "tests/amdgpu: Add test for ODM combine"
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".