From: Patchwork <patchwork@emeril.freedesktop.org>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for Revert "nvme-pci: use host managed power state for suspend"
Date: Fri, 16 Aug 2019 16:59:45 -0000 [thread overview]
Message-ID: <20190816165945.13756.43250@emeril.freedesktop.org> (raw)
In-Reply-To: <20190816121549.8754-1-chris@chris-wilson.co.uk>
== 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".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2019-08-16 16:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-16 12:15 [PATCH] Revert "nvme-pci: use host managed power state for suspend" Chris Wilson
2019-08-16 12:26 ` Christoph Hellwig
2019-08-16 12:30 ` Chris Wilson
2019-08-16 12:38 ` Christoph Hellwig
2019-08-16 12:46 ` Keith Busch
2019-08-16 14:12 ` Chris Wilson
2019-08-16 14:26 ` Keith Busch
2019-08-16 16:59 ` Patchwork [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190816165945.13756.43250@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox