[igt-dev] ✗ Fi.CI.BUILD: failure for tests/amdgpu: add VM test (rev4)

[Patchwork]

== Series Details ==

Series: tests/amdgpu: add VM test (rev4)
URL   : https://patchwork.freedesktop.org/series/120475/
State : failure

== Summary ==

Applying: tests/amdgpu: add VM test
Using index info to reconstruct a base tree...
M	tests/amdgpu/meson.build
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in tests/amdgpu/amd_vm.c
Auto-merging tests/amdgpu/amd_vm.c
Patch failed at 0001 tests/amdgpu: add VM test
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".