Switched to a new branch '20240708044839.2120-1-east.moutain.yang@gmail.com'
Applying: virtio-net: Fix network stall at the host side waiting for kick
Using index info to reconstruct a base tree...
M	hw/net/virtio-net.c
M	hw/virtio/virtio.c
M	include/hw/virtio/virtio.h
Falling back to patching base and 3-way merge...
Auto-merging include/hw/virtio/virtio.h
CONFLICT (content): Merge conflict in include/hw/virtio/virtio.h
Auto-merging hw/virtio/virtio.c
Auto-merging hw/net/virtio-net.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-net: Fix network stall at the host side waiting for kick
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".