Switched to a new branch '20230313095023.3477917-1-oro@il.ibm.com' Applying: qemu: capabilities: Introduce QEMU_CAPS_RBD_ENCRYPTION_LAYERING capability Using index info to reconstruct a base tree... M src/qemu/qemu_capabilities.c M src/qemu/qemu_capabilities.h M tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml Falling back to patching base and 3-way merge... Auto-merging tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml CONFLICT (content): Merge conflict in tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml Auto-merging src/qemu/qemu_capabilities.h CONFLICT (content): Merge conflict in src/qemu/qemu_capabilities.h Auto-merging src/qemu/qemu_capabilities.c CONFLICT (content): Merge conflict in 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 0001 qemu: capabilities: Introduce QEMU_CAPS_RBD_ENCRYPTION_LAYERING capability 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".