== Series Details == Series: PCI: BAR resizing fix/rework URL : https://patchwork.freedesktop.org/series/156675/ State : failure
== Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/156675/revisions/1/mbox/ not applied Applying: PCI: Prevent resource tree corruption when BAR resize fails Applying: PCI/IOV: Adjust ->barsz[] when changing BAR size Applying: PCI: Change pci_dev variable from 'bridge' to 'dev' Applying: PCI: Try BAR resize even when no window was released Applying: PCI: Fix restoring BARs on BAR resize rollback path Applying: drm/xe: Remove driver side BAR release before resize Using index info to reconstruct a base tree... M drivers/gpu/drm/xe/xe_vram.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/xe/xe_vram.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vram.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0006 drm/xe: Remove driver side BAR release before resize 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". Build failed, no error log produced
