Switched to a new branch '20241127193736.972459-1-laine@redhat.com'
Applying: qemu: re-use existing ActualNetDef for more interface types during update-device
Using index info to reconstruct a base tree...
M	src/qemu/qemu_hotplug.c
Falling back to patching base and 3-way merge...
Auto-merging src/qemu/qemu_hotplug.c
CONFLICT (content): Merge conflict in src/qemu/qemu_hotplug.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: re-use existing ActualNetDef for more interface types during update-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".