Switched to a new branch '20260226025740.71673-1-stewart.hildebrand@amd.com'
Applying: vpci/msix: check for BARs enabled in vpci_make_msix_hole
Using index info to reconstruct a base tree...
M	xen/drivers/vpci/header.c
M	xen/drivers/vpci/msix.c
M	xen/include/xen/vpci.h
Falling back to patching base and 3-way merge...
Auto-merging xen/drivers/vpci/header.c
Auto-merging xen/drivers/vpci/msix.c
Auto-merging xen/include/xen/vpci.h
CONFLICT (content): Merge conflict in xen/include/xen/vpci.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 vpci/msix: check for BARs enabled in vpci_make_msix_hole