From: Patchwork <patchwork@emeril.freedesktop.org>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: igt-dev@lists.freedesktop.org
Subject: [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/2] intel-ci: Comment on kernel selftest exclusion
Date: Fri, 10 Aug 2018 12:56:10 -0000 [thread overview]
Message-ID: <20180810125610.8594.91095@emeril.freedesktop.org> (raw)
In-Reply-To: <20180810094145.10182-1-chris@chris-wilson.co.uk>
== Series Details ==
Series: series starting with [i-g-t,1/2] intel-ci: Comment on kernel selftest exclusion
URL : https://patchwork.freedesktop.org/series/47994/
State : failure
== Summary ==
Applying: intel-ci: Comment on kernel selftest exclusion
Using index info to reconstruct a base tree...
M tests/intel-ci/blacklist.txt
Falling back to patching base and 3-way merge...
Auto-merging tests/intel-ci/blacklist.txt
CONFLICT (content): Merge conflict in tests/intel-ci/blacklist.txt
Patch failed at 0001 intel-ci: Comment on kernel selftest exclusion
Use 'git am --show-current-patch' to see the failed patch
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".
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
prev parent reply other threads:[~2018-08-10 12:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-10 9:41 [igt-dev] [PATCH i-g-t 1/2] intel-ci: Comment on kernel selftest exclusion Chris Wilson
2018-08-10 9:41 ` [Intel-gfx] [PATCH i-g-t 2/2] intel-ci: Skip module reloads Chris Wilson
2018-08-10 9:55 ` [Intel-gfx] [igt-dev] " Petri Latvala
2018-08-10 10:05 ` Chris Wilson
2018-08-10 12:56 ` 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=20180810125610.8594.91095@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=chris@chris-wilson.co.uk \
--cc=igt-dev@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;
as well as URLs for NNTP newsgroup(s).