Switched to a new branch '20240807073752.64256-1-sandesh.patel@nutanix.com'
Applying: Conf: add dma_translation attribute to iommu
Using index info to reconstruct a base tree...
M	docs/formatdomain.rst
M	src/conf/domain_conf.c
M	src/conf/domain_conf.h
M	src/conf/schemas/domaincommon.rng
Falling back to patching base and 3-way merge...
Auto-merging src/conf/schemas/domaincommon.rng
Auto-merging src/conf/domain_conf.h
Auto-merging src/conf/domain_conf.c
Auto-merging docs/formatdomain.rst
CONFLICT (content): Merge conflict in docs/formatdomain.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Conf: add dma_translation attribute to iommu
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".