From: Patchwork <patchwork@emeril.freedesktop.org>
To: John Harrison <John.C.Harrison@Intel.com>
Cc: igt-dev@lists.freedesktop.org
Subject: [igt-dev] ✗ Fi.CI.BAT: failure for trace.pl fixes and improvements (rev2)
Date: Wed, 11 Jul 2018 23:21:35 -0000 [thread overview]
Message-ID: <20180711232135.19437.97317@emeril.freedesktop.org> (raw)
In-Reply-To: <20180709132004.14468-1-tvrtko.ursulin@linux.intel.com>
== Series Details ==
Series: trace.pl fixes and improvements (rev2)
URL : https://patchwork.freedesktop.org/series/46177/
State : failure
== Summary ==
Applying: trace.pl: Fix no context colouring mode
Applying: trace.pl: Improve readability of graphical timeline representation
Using index info to reconstruct a base tree...
M scripts/trace.pl
Falling back to patching base and 3-way merge...
Auto-merging scripts/trace.pl
CONFLICT (content): Merge conflict in scripts/trace.pl
Patch failed at 0002 trace.pl: Improve readability of graphical timeline representation
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-07-11 23:21 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-09 13:19 [Intel-gfx] [PATCH i-g-t 00/11] trace.pl fixes and improvements Tvrtko Ursulin
2018-07-09 13:19 ` [igt-dev] [PATCH i-g-t 01/11] trace.pl: Fix no context colouring mode Tvrtko Ursulin
2018-07-11 17:49 ` John Harrison
2018-07-09 13:19 ` [igt-dev] [PATCH i-g-t 02/11] trace.pl: Improve readability of graphical timeline representation Tvrtko Ursulin
2018-07-11 22:07 ` [Intel-gfx] " John Harrison
2018-07-09 13:19 ` [igt-dev] [PATCH i-g-t 03/11] trace.pl: Scale timeline for better precision Tvrtko Ursulin
2018-07-09 13:26 ` Chris Wilson
2018-07-09 13:40 ` [Intel-gfx] " Tvrtko Ursulin
2018-07-11 17:52 ` John Harrison
2018-07-09 13:19 ` [igt-dev] [PATCH i-g-t 04/11] trace.pl: Put single context at single vertical slot Tvrtko Ursulin
2018-07-11 17:55 ` John Harrison
2018-07-09 13:19 ` [igt-dev] [PATCH i-g-t 05/11] trace.pl: Fix HTML timestamp generation Tvrtko Ursulin
2018-07-11 18:01 ` John Harrison
2018-07-09 13:19 ` [igt-dev] [PATCH i-g-t 06/11] trace.pl: Improve context colouring for large context id's Tvrtko Ursulin
2018-07-11 22:16 ` John Harrison
2018-07-09 13:20 ` [igt-dev] [PATCH i-g-t 07/11] trace.pl: Fix engine busy accounting in split mode Tvrtko Ursulin
2018-07-12 6:38 ` John Harrison
2018-07-09 13:20 ` [igt-dev] [PATCH i-g-t 08/11] trace.pl: Context save only applies to last request of a bunch Tvrtko Ursulin
2018-07-09 13:20 ` [igt-dev] [PATCH i-g-t 09/11] trace.pl: Fix incomplete request handling Tvrtko Ursulin
2018-07-09 13:20 ` [igt-dev] [PATCH i-g-t 10/11] trace.pl: Basic preemption support Tvrtko Ursulin
2018-07-09 13:20 ` [igt-dev] [PATCH i-g-t 11/11] trace.pl: Fix request split mode Tvrtko Ursulin
2018-07-09 14:53 ` [igt-dev] ✓ Fi.CI.BAT: success for trace.pl fixes and improvements Patchwork
2018-07-09 21:50 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2018-07-11 23:21 ` 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=20180711232135.19437.97317@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=John.C.Harrison@Intel.com \
--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).