Switched to a new branch '20240919072944.21262-1-yaozhenguo@jd.com'
Applying: virtio/vhost-user: fix qemu abort when hotunplug vhost-user-net device
Using index info to reconstruct a base tree...
M	hw/virtio/vhost-user.c
M	include/hw/virtio/vhost-user.h
Falling back to patching base and 3-way merge...
Auto-merging include/hw/virtio/vhost-user.h
CONFLICT (content): Merge conflict in include/hw/virtio/vhost-user.h
Auto-merging hw/virtio/vhost-user.c
CONFLICT (content): Merge conflict in hw/virtio/vhost-user.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 virtio/vhost-user: fix qemu abort when hotunplug vhost-user-net device
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".