From: Patchwork <patchwork@emeril.freedesktop.org>
To: Tvrtko Ursulin <tursulin@ursulin.net>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for drm/i915/tracing: Enable user interrupts while intel_engine_notify is active
Date: Wed, 08 Aug 2018 15:20:16 -0000 [thread overview]
Message-ID: <20180808152016.2289.90672@emeril.freedesktop.org> (raw)
In-Reply-To: <20180808151424.5183-1-tvrtko.ursulin@linux.intel.com>
== Series Details ==
Series: drm/i915/tracing: Enable user interrupts while intel_engine_notify is active
URL : https://patchwork.freedesktop.org/series/47897/
State : failure
== Summary ==
Applying: drm/i915/tracing: Enable user interrupts while intel_engine_notify is active
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_trace.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_trace.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_trace.h
error: Failed to merge in the changes.
Patch failed at 0001 drm/i915/tracing: Enable user interrupts while intel_engine_notify is active
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".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-08-08 15:20 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-08 15:14 [PATCH v2] drm/i915/tracing: Enable user interrupts while intel_engine_notify is active Tvrtko Ursulin
2018-08-08 15:20 ` Patchwork [this message]
2018-08-08 15:34 ` Chris Wilson
2018-08-09 9:07 ` [PATCH v3] " Tvrtko Ursulin
2018-08-09 9:09 ` Tvrtko Ursulin
2018-08-09 9:22 ` Chris Wilson
2018-08-09 9:31 ` Tvrtko Ursulin
2018-08-09 10:01 ` [PATCH v4] " Tvrtko Ursulin
2018-08-09 10:04 ` Chris Wilson
2018-08-09 10:12 ` [PATCH v5] " Tvrtko Ursulin
2018-08-11 22:39 ` [PATCH v4] " kbuild test robot
2018-08-11 22:47 ` kbuild test robot
2018-08-09 9:29 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915/tracing: Enable user interrupts while intel_engine_notify is active (rev2) Patchwork
2018-08-09 9:30 ` ✗ Fi.CI.SPARSE: " Patchwork
2018-08-09 9:46 ` ✓ Fi.CI.BAT: success " Patchwork
2018-08-09 10:12 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915/tracing: Enable user interrupts while intel_engine_notify is active (rev3) Patchwork
2018-08-09 10:13 ` ✗ Fi.CI.SPARSE: " Patchwork
2018-08-09 10:29 ` ✓ Fi.CI.BAT: success " Patchwork
2018-08-09 10:33 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915/tracing: Enable user interrupts while intel_engine_notify is active (rev4) Patchwork
2018-08-09 10:34 ` ✗ Fi.CI.SPARSE: " Patchwork
2018-08-09 10:51 ` ✓ Fi.CI.BAT: success " Patchwork
2018-08-09 11:41 ` ✓ 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=20180808152016.2289.90672@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