[igt-dev] ✗ Fi.CI.BUILD: failure for series starting with [1/7] lib/amdgpu: add amdgpu_bo_alloc_and_map_raw helper

[Patchwork]

== Series Details ==

Series: series starting with [1/7] lib/amdgpu: add amdgpu_bo_alloc_and_map_raw helper
URL   : https://patchwork.freedesktop.org/series/109798/
State : failure

== Summary ==

Applying: lib/amdgpu: add amdgpu_bo_alloc_and_map_raw helper
Applying: lib/amdgpu: add deadlock helpers
Applying: tests/amdgpu: add deadlock test for gfx, compute and sdma
Applying: lib/amdgpu: add memory and reg.access helper
Using index info to reconstruct a base tree...
M	lib/amdgpu/amd_PM4.h
Falling back to patching base and 3-way merge...
Auto-merging lib/amdgpu/amd_PM4.h
CONFLICT (content): Merge conflict in lib/amdgpu/amd_PM4.h
Patch failed at 0004 lib/amdgpu: add memory and reg.access helper
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".