From: Patchwork <patchwork@emeril.freedesktop.org>
To: Andi Shyti <andi.shyti@intel.com>
Cc: igt-dev@lists.freedesktop.org
Subject: [igt-dev] ✗ Fi.CI.BAT: failure for new engine discovery interface
Date: Mon, 18 Mar 2019 23:33:28 -0000 [thread overview]
Message-ID: <20190318233328.20494.89289@emeril.freedesktop.org> (raw)
In-Reply-To: <20190318232812.1307-1-andi.shyti@intel.com>
== Series Details ==
Series: new engine discovery interface
URL : https://patchwork.freedesktop.org/series/58154/
State : failure
== Summary ==
Applying: lib/igt_gt: remove unnecessary argument
Applying: lib: ioctl_wrappers: reach engines by index as well
Applying: lib: move gem_context_has_engine from ioctl_wrappers to gem_context
Applying: include/drm-uapi: import i915_drm.h header file
Using index info to reconstruct a base tree...
M include/drm-uapi/i915_drm.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm-uapi/i915_drm.h
CONFLICT (content): Merge conflict in include/drm-uapi/i915_drm.h
Patch failed at 0004 include/drm-uapi: import i915_drm.h header file
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
next prev parent reply other threads:[~2019-03-18 23:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-18 23:28 [igt-dev] [PATCH v12 0/7] new engine discovery interface Andi Shyti
2019-03-18 23:28 ` [igt-dev] [PATCH v12 1/7] lib/igt_gt: remove unnecessary argument Andi Shyti
2019-03-18 23:28 ` [igt-dev] [PATCH v12 2/7] lib: ioctl_wrappers: reach engines by index as well Andi Shyti
2019-03-18 23:28 ` [igt-dev] [PATCH v12 3/7] lib: move gem_context_has_engine from ioctl_wrappers to gem_context Andi Shyti
2019-03-18 23:28 ` [igt-dev] [PATCH v12 4/7] include/drm-uapi: import i915_drm.h header file Andi Shyti
2019-03-18 23:28 ` [igt-dev] [PATCH v12 5/7] lib/i915: add gem_engine_topology library Andi Shyti
2019-03-19 9:43 ` Chris Wilson
2019-03-19 10:00 ` Andi Shyti
2019-03-19 10:18 ` Tvrtko Ursulin
2019-03-19 10:44 ` Andi Shyti
2019-03-19 11:01 ` Tvrtko Ursulin
2019-03-18 23:28 ` [igt-dev] [PATCH v12 6/7] lib/igt_gt: use for_each_engine_class_instance to loop through active engines Andi Shyti
2019-03-19 10:22 ` Tvrtko Ursulin
2019-03-19 10:26 ` Andi Shyti
2019-03-18 23:28 ` [igt-dev] [PATCH v12 7/7] tests: gem_exec_basic: add "exec-ctx" buffer execution demo test Andi Shyti
2019-03-18 23:33 ` Patchwork [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-04-08 16:15 [igt-dev] [PATCH v19 0/6] new engine discovery interface Andi Shyti
2019-04-08 17:35 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
2019-02-14 0:44 [igt-dev] [RFC PATCH v9 0/5] " Andi Shyti via igt-dev
2019-02-14 10:14 ` [igt-dev] ✗ Fi.CI.BAT: failure for " 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=20190318233328.20494.89289@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=andi.shyti@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