[igt-dev] ✗ Fi.CI.BUILD: failure for lib/igt_amd: return negative if PSR state debugfs open fails (rev3)
Patchwork
patchwork at emeril.freedesktop.org
Wed Apr 6 22:57:57 UTC 2022
== Series Details ==
Series: lib/igt_amd: return negative if PSR state debugfs open fails (rev3)
URL : https://patchwork.freedesktop.org/series/102150/
State : failure
== Summary ==
Applying: lib/igt_amd: return negative if PSR state debugfs open fails
Using index info to reconstruct a base tree...
M lib/igt_amd.c
M tests/amdgpu/amd_psr.c
Falling back to patching base and 3-way merge...
Auto-merging tests/amdgpu/amd_psr.c
CONFLICT (content): Merge conflict in tests/amdgpu/amd_psr.c
Auto-merging lib/igt_amd.c
Patch failed at 0001 lib/igt_amd: return negative if PSR state debugfs open fails
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".
More information about the igt-dev
mailing list