[Intel-gfx] ✗ Fi.CI.BAT: failure for Revert "nvme-pci: use host managed power state for suspend"

Patchwork patchwork at emeril.freedesktop.org
Fri Aug 16 16:59:45 UTC 2019


== Series Details ==

Series: Revert "nvme-pci: use host managed power state for suspend"
URL   : https://patchwork.freedesktop.org/series/65309/
State : failure

== Summary ==

Applying: Revert "nvme-pci: use host managed power state for suspend"
Using index info to reconstruct a base tree...
M	drivers/nvme/host/pci.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/nvme/host/pci.c
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Revert "nvme-pci: use host managed power state for suspend"
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".



More information about the Intel-gfx mailing list