== Series Details == Series: PCI: Move VMD ASPM/LTR fix to PCI quirk URL : https://patchwork.freedesktop.org/series/116343/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/116343/revisions/1/mbox/ not applied Applying: PCI: Move VMD ASPM/LTR fix to PCI quirk Using index info to reconstruct a base tree... M drivers/pci/controller/vmd.c Falling back to patching base and 3-way merge... Auto-merging drivers/pci/controller/vmd.c CONFLICT (content): Merge conflict in drivers/pci/controller/vmd.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 PCI: Move VMD ASPM/LTR fix to PCI quirk 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
