[igt-dev] ✗ Fi.CI.BUILD: failure for tests/msm: Read the devcore back in recovery tests

[Patchwork]

== Series Details ==

Series: tests/msm: Read the devcore back in recovery tests
URL   : https://patchwork.freedesktop.org/series/111828/
State : failure

== Summary ==

Applying: tests/msm: Read the devcore back in recovery tests
Using index info to reconstruct a base tree...
M	tests/msm/msm_recovery.c
Falling back to patching base and 3-way merge...
Auto-merging tests/msm/msm_recovery.c
CONFLICT (content): Merge conflict in tests/msm/msm_recovery.c
Patch failed at 0001 tests/msm: Read the devcore back in recovery tests
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".