From: Patchwork <patchwork@emeril.freedesktop.org>
To: Tvrtko Ursulin <tursulin@ursulin.net>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for scripts/trace.pl: Optimize event parsing and processing (rev2)
Date: Wed, 20 Dec 2017 10:33:35 -0000 [thread overview]
Message-ID: <20171220103335.5346.57031@emeril.freedesktop.org> (raw)
In-Reply-To: <20171219111539.11231-1-tvrtko.ursulin@linux.intel.com>
== Series Details ==
Series: scripts/trace.pl: Optimize event parsing and processing (rev2)
URL : https://patchwork.freedesktop.org/series/35569/
State : failure
== Summary ==
Applying: scripts/trace.pl: Optimize event parsing and processing
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 0001 scripts/trace.pl: Optimize event parsing and processing
The copy of the patch that failed is found in: .git/rebase-apply/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".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-12-20 10:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-19 11:15 [PATCH i-g-t] scripts/trace.pl: Optimize event parsing and processing Tvrtko Ursulin
2017-12-19 11:39 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-12-19 13:23 ` ✓ Fi.CI.IGT: " Patchwork
2017-12-19 15:02 ` [PATCH i-g-t] " Chris Wilson
2017-12-19 16:23 ` John Harrison
2017-12-20 9:41 ` [PATCH i-g-t v2] " Tvrtko Ursulin
2017-12-21 9:37 ` [PATCH i-g-t v3] " Tvrtko Ursulin
2017-12-20 9:54 ` [PATCH i-g-t] " Tvrtko Ursulin
2017-12-20 23:50 ` John Harrison
2017-12-21 9:34 ` Tvrtko Ursulin
2017-12-21 22:44 ` John Harrison
2017-12-22 9:16 ` [PATCH i-g-t v4] " Tvrtko Ursulin
2017-12-22 20:38 ` John Harrison
2017-12-20 10:33 ` Patchwork [this message]
2017-12-21 11:11 ` ✓ Fi.CI.BAT: success for scripts/trace.pl: Optimize event parsing and processing (rev3) Patchwork
2017-12-21 13:27 ` ✗ Fi.CI.IGT: warning " Patchwork
2017-12-22 9:34 ` ✓ Fi.CI.BAT: success for scripts/trace.pl: Optimize event parsing and processing (rev5) Patchwork
2017-12-22 10:21 ` ✓ Fi.CI.IGT: " Patchwork
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=20171220103335.5346.57031@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=tursulin@ursulin.net \
/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