Switched to a new branch '20260521112729.1287282-1-armbru@redhat.com'
Applying: qapi/net: Rename NetDevPasstOptions to NetdevPasstOptions
Using index info to reconstruct a base tree...
M	net/passt.c
M	qapi/net.json
Falling back to patching base and 3-way merge...
Auto-merging qapi/net.json
Auto-merging net/passt.c
No changes -- Patch already applied.
Applying: qapi/net: Wean passt off QAPI type String to improve documentation
Using index info to reconstruct a base tree...
M	net/passt.c
M	qapi/net.json
Falling back to patching base and 3-way merge...
Auto-merging qapi/net.json
Applying: qapi/net: Wean SLIRP off QAPI type String to improve documentation
Using index info to reconstruct a base tree...
M	net/slirp.c
M	qapi/net.json
Falling back to patching base and 3-way merge...
Auto-merging qapi/net.json
No changes -- Patch already applied.
Applying: qapi/net: Drop unused type String
Using index info to reconstruct a base tree...
M	qapi/net.json
Falling back to patching base and 3-way merge...
Auto-merging qapi/net.json
CONFLICT (content): Merge conflict in qapi/net.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 qapi/net: Drop unused type String
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".