Switched to a new branch '20250427114807.4214-1-honglei.wang@smartx.com'
Applying: qemu: Add support for NVMe namespace disk bus type
Applying: qemu_capabilities: Add support for nvme-ns bus capabilities
Using index info to reconstruct a base tree...
M	src/qemu/qemu_capabilities.c
M	src/qemu/qemu_capabilities.h
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_5.0.0-tcg-virt.riscv64.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.1.0.sparc.xml
M	tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
Falling back to patching base and 3-way merge...
Auto-merging tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
CONFLICT (content): Merge conflict in tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
Auto-merging tests/domaincapsdata/qemu_9.0.0.sparc.xml
CONFLICT (modify/delete): tests/domaincapsdata/qemu_5.0.0.ppc64.xml deleted in HEAD and modified in qemu_capabilities: Add support for nvme-ns bus capabilities. Version qemu_capabilities: Add support for nvme-ns bus capabilities of tests/domaincapsdata/qemu_5.0.0.ppc64.xml left in tree.
CONFLICT (modify/delete): tests/domaincapsdata/qemu_5.0.0.aarch64.xml deleted in HEAD and modified in qemu_capabilities: Add support for nvme-ns bus capabilities. Version qemu_capabilities: Add support for nvme-ns bus capabilities of tests/domaincapsdata/qemu_5.0.0.aarch64.xml left in tree.
CONFLICT (modify/delete): tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml deleted in HEAD and modified in qemu_capabilities: Add support for nvme-ns bus capabilities. Version qemu_capabilities: Add support for nvme-ns bus capabilities of tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml left in tree.
CONFLICT (modify/delete): tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml deleted in HEAD and modified in qemu_capabilities: Add support for nvme-ns bus capabilities. Version qemu_capabilities: Add support for nvme-ns bus capabilities of tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml left in tree.
CONFLICT (modify/delete): tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml deleted in HEAD and modified in qemu_capabilities: Add support for nvme-ns bus capabilities. Version qemu_capabilities: Add support for nvme-ns bus capabilities of tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml left in tree.
CONFLICT (modify/delete): tests/domaincapsdata/qemu_4.2.0.ppc64.xml deleted in HEAD and modified in qemu_capabilities: Add support for nvme-ns bus capabilities. Version qemu_capabilities: Add support for nvme-ns bus capabilities of tests/domaincapsdata/qemu_4.2.0.ppc64.xml left in tree.
CONFLICT (modify/delete): tests/domaincapsdata/qemu_4.2.0.aarch64.xml deleted in HEAD and modified in qemu_capabilities: Add support for nvme-ns bus capabilities. Version qemu_capabilities: Add support for nvme-ns bus capabilities of tests/domaincapsdata/qemu_4.2.0.aarch64.xml left in tree.
CONFLICT (modify/delete): tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml deleted in HEAD and modified in qemu_capabilities: Add support for nvme-ns bus capabilities. Version qemu_capabilities: Add support for nvme-ns bus capabilities of tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml left in tree.
Auto-merging src/qemu/qemu_capabilities.h
Auto-merging src/qemu/qemu_capabilities.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 qemu_capabilities: Add support for nvme-ns bus capabilities
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".