Switched to a new branch '20240222130209.8316-1-fiuczy@linux.ibm.com'
Applying: virmdev: prepare type and attributes for dual state
Using index info to reconstruct a base tree...
M	src/conf/node_device_conf.c
M	src/conf/node_device_conf.h
M	src/node_device/node_device_driver.c
M	src/node_device/node_device_udev.c
M	src/util/virmdev.h
Falling back to patching base and 3-way merge...
Auto-merging src/node_device/node_device_udev.c
CONFLICT (content): Merge conflict in src/node_device/node_device_udev.c
Auto-merging src/node_device/node_device_driver.c
CONFLICT (content): Merge conflict in src/node_device/node_device_driver.c
Auto-merging src/conf/node_device_conf.h
CONFLICT (content): Merge conflict in src/conf/node_device_conf.h
Auto-merging src/conf/node_device_conf.c
CONFLICT (content): Merge conflict in src/conf/node_device_conf.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 virmdev: prepare type and attributes for dual state
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".