✗ Fi.CI.BUILD: failure for series starting with [1/2] tests/amdgpu: Add queue reset test

[Patchwork]

== Series Details ==

Series: series starting with [1/2] tests/amdgpu: Add queue reset test
URL   : https://patchwork.freedesktop.org/series/136952/
State : failure

== Summary ==

Applying: tests/amdgpu: Add queue reset 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_queue_reset.c
Auto-merging tests/amdgpu/amd_queue_reset.c
Patch failed at 0001 tests/amdgpu: Add queue reset 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".