Switched to a new branch '20241115114010.51342-1-kraxel@redhat.com'
Applying: add guest hint variable
Applying: use guest hint as additional condition
Using index info to reconstruct a base tree...
M	src/fw/pciinit.c
Falling back to patching base and 3-way merge...
Auto-merging src/fw/pciinit.c
CONFLICT (content): Merge conflict in src/fw/pciinit.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 use guest hint as additional condition
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".