== Series Details ==

Series: igt tests for hot-unplug feature in amdgpu
URL   : https://patchwork.freedesktop.org/series/90949/
State : failure

== Summary ==

Applying: tests/core_hotunplug: Add command submission for amdgpu
Using index info to reconstruct a base tree...
A	tests/Makefile.am
M	tests/core_hotunplug.c
M	tests/meson.build
Falling back to patching base and 3-way merge...
Auto-merging tests/meson.build
Auto-merging tests/core_hotunplug.c
CONFLICT (modify/delete): tests/Makefile.am deleted in HEAD and modified in tests/core_hotunplug: Add command submission for amdgpu. Version tests/core_hotunplug: Add command submission for amdgpu of tests/Makefile.am left in tree.
Patch failed at 0001 tests/core_hotunplug: Add command submission for amdgpu
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".


_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev