Switched to a new branch 'b89a32c924f0a9235c70375fdfa9a4de510e7284.1745826099.git.pkrempa@redhat.com'
Applying: domaincapstest: Remove XMLs for already dropped qemu versions (4.2.0 - 5.1.0)
Using index info to reconstruct a base tree...
A	tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
A	tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
A	tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
A	tests/domaincapsdata/qemu_4.2.0.aarch64.xml
A	tests/domaincapsdata/qemu_4.2.0.ppc64.xml
A	tests/domaincapsdata/qemu_4.2.0.s390x.xml
A	tests/domaincapsdata/qemu_4.2.0.x86_64.xml
A	tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
A	tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml
A	tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
A	tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
A	tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml
A	tests/domaincapsdata/qemu_5.0.0.aarch64.xml
A	tests/domaincapsdata/qemu_5.0.0.ppc64.xml
A	tests/domaincapsdata/qemu_5.0.0.x86_64.xml
A	tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
A	tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
A	tests/domaincapsdata/qemu_5.1.0.sparc.xml
A	tests/domaincapsdata/qemu_5.1.0.x86_64.xml
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): tests/domaincapsdata/qemu_5.0.0.aarch64.xml deleted in domaincapstest: Remove XMLs for already dropped qemu versions (4.2.0 - 5.1.0) and renamed to tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml in HEAD. Version HEAD of tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml left in tree.
CONFLICT (rename/delete): tests/domaincapsdata/qemu_4.2.0.s390x.xml deleted in domaincapstest: Remove XMLs for already dropped qemu versions (4.2.0 - 5.1.0) and renamed to tests/domaincapsdata/qemu_9.1.0.s390x.xml in HEAD. Version HEAD of tests/domaincapsdata/qemu_9.1.0.s390x.xml left in tree.
CONFLICT (rename/delete): tests/domaincapsdata/qemu_5.1.0.sparc.xml deleted in domaincapstest: Remove XMLs for already dropped qemu versions (4.2.0 - 5.1.0) and renamed to tests/domaincapsdata/qemu_9.0.0.sparc.xml in HEAD. Version HEAD of tests/domaincapsdata/qemu_9.0.0.sparc.xml left in tree.
CONFLICT (rename/delete): tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml deleted in domaincapstest: Remove XMLs for already dropped qemu versions (4.2.0 - 5.1.0) and renamed to tests/domaincapsdata/qemu_8.2.0.aarch64.xml in HEAD. Version HEAD of tests/domaincapsdata/qemu_8.2.0.aarch64.xml left in tree.
CONFLICT (rename/delete): tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml deleted in domaincapstest: Remove XMLs for already dropped qemu versions (4.2.0 - 5.1.0) and renamed to tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml in HEAD. Version HEAD of tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml left in tree.
CONFLICT (rename/delete): tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml deleted in domaincapstest: Remove XMLs for already dropped qemu versions (4.2.0 - 5.1.0) and renamed to tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml in HEAD. Version HEAD of tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml left in tree.
CONFLICT (rename/delete): tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml deleted in domaincapstest: Remove XMLs for already dropped qemu versions (4.2.0 - 5.1.0) and renamed to tests/domaincapsdata/qemu_7.2.0.ppc.xml in HEAD. Version HEAD of tests/domaincapsdata/qemu_7.2.0.ppc.xml left in tree.
CONFLICT (rename/delete): tests/domaincapsdata/qemu_4.2.0.ppc64.xml deleted in domaincapstest: Remove XMLs for already dropped qemu versions (4.2.0 - 5.1.0) and renamed to tests/domaincapsdata/qemu_7.0.0.ppc64.xml in HEAD. Version HEAD of tests/domaincapsdata/qemu_7.0.0.ppc64.xml left in tree.
CONFLICT (rename/delete): tests/domaincapsdata/qemu_5.0.0.ppc64.xml deleted in domaincapstest: Remove XMLs for already dropped qemu versions (4.2.0 - 5.1.0) and renamed to tests/domaincapsdata/qemu_6.2.0.ppc64.xml in HEAD. Version HEAD of tests/domaincapsdata/qemu_6.2.0.ppc64.xml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 domaincapstest: Remove XMLs for already dropped qemu versions (4.2.0 - 5.1.0)
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".