== Series Details == Series: PCI: Resizable BAR improvements (rev4) URL : https://patchwork.freedesktop.org/series/154362/ State : failure
== Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/154362/revisions/4/mbox/ not applied Applying: PCI: Move Resizable BAR code into rebar.c Applying: PCI: Cleanup pci_rebar_bytes_to_size() and move into rebar.c Applying: PCI: Move pci_rebar_size_to_bytes() and export it Applying: PCI: Improve Resizable BAR functions kernel doc Applying: PCI: Add pci_rebar_size_supported() helper Applying: drm/i915/gt: Use pci_rebar_size_supported() Applying: drm/xe/vram: Use PCI rebar helpers in resize_vram_bar() 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 0007 drm/xe/vram: Use PCI rebar helpers in resize_vram_bar() 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
