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,01/12] i915: Add gem_vm_create (rev2)
Date: Wed, 22 May 2019 12:54:01 -0000 [thread overview]
Message-ID: <20190522125401.10328.80437@emeril.freedesktop.org> (raw)
In-Reply-To: <20190522113712.23512-1-chris@chris-wilson.co.uk>
== Series Details ==
Series: series starting with [i-g-t,01/12] i915: Add gem_vm_create (rev2)
URL : https://patchwork.freedesktop.org/series/60958/
State : failure
== Summary ==
Applying: i915: Add gem_vm_create
Applying: i915/gem_ctx_param: Test set/get (copy) VM
Applying: i915/gem_ctx_create: Basic checks for constructor properties
Applying: i915: Add gem_ctx_clone
Applying: i915: Exercise creating context with shared GTT
Using index info to reconstruct a base tree...
M tests/i915/gem_exec_whisper.c
Falling back to patching base and 3-way merge...
Auto-merging tests/i915/gem_exec_whisper.c
CONFLICT (content): Merge conflict in tests/i915/gem_exec_whisper.c
Patch failed at 0005 i915: Exercise creating context with shared GTT
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:[~2019-05-22 12:54 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-22 11:37 [Intel-gfx] [PATCH i-g-t 01/12] i915: Add gem_vm_create Chris Wilson
2019-05-22 11:37 ` [igt-dev] [PATCH i-g-t 02/12] i915/gem_ctx_param: Test set/get (copy) VM Chris Wilson
2019-05-22 11:37 ` [igt-dev] [PATCH i-g-t 03/12] i915/gem_ctx_create: Basic checks for constructor properties Chris Wilson
2019-05-23 13:41 ` Tvrtko Ursulin
2019-05-22 11:37 ` [Intel-gfx] [PATCH i-g-t 04/12] i915: Add gem_ctx_clone Chris Wilson
2019-05-22 11:37 ` [igt-dev] [PATCH i-g-t 05/12] i915: Exercise creating context with shared GTT Chris Wilson
2019-05-23 13:39 ` [Intel-gfx] " Tvrtko Ursulin
2019-05-22 11:37 ` [igt-dev] [PATCH i-g-t 06/12] i915/gem_ctx_switch: Exercise queues Chris Wilson
2019-05-22 11:37 ` [igt-dev] [PATCH i-g-t 07/12] i915/gem_exec_whisper: Fork all-engine tests one-per-engine Chris Wilson
2019-05-22 11:37 ` [igt-dev] [PATCH i-g-t 08/12] i915: Add gem_ctx_engines Chris Wilson
2019-05-22 11:37 ` [igt-dev] [PATCH i-g-t 09/12] i915: Add gem_exec_balancer Chris Wilson
2019-05-22 12:13 ` Tvrtko Ursulin
2019-05-22 11:37 ` [igt-dev] [PATCH i-g-t 10/12] i915/gem_exec_balancer: Exercise bonded pairs Chris Wilson
2019-05-22 12:26 ` [Intel-gfx] " Tvrtko Ursulin
2019-05-22 12:33 ` [igt-dev] " Chris Wilson
2019-05-22 12:52 ` [igt-dev] [PATCH i-g-t] " Chris Wilson
2019-05-22 13:08 ` [igt-dev] [Intel-gfx] " Tvrtko Ursulin
2019-05-22 11:37 ` [igt-dev] [PATCH i-g-t 11/12] i915/gem_exec_latency: Measure the latency of context switching Chris Wilson
2019-05-22 11:37 ` [igt-dev] [PATCH i-g-t 12/12] i915/gem_exec_latency: Add another variant of waiter latency Chris Wilson
2019-05-22 12:54 ` 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=20190522125401.10328.80437@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