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/24] i915/gem_exec_latency: Measure the latency of context switching (rev2)
Date: Tue, 26 Mar 2019 11:00:29 -0000 [thread overview]
Message-ID: <20190326110029.29940.50589@emeril.freedesktop.org> (raw)
In-Reply-To: <20190322092155.1656-1-chris@chris-wilson.co.uk>
== Series Details ==
Series: series starting with [i-g-t,01/24] i915/gem_exec_latency: Measure the latency of context switching (rev2)
URL : https://patchwork.freedesktop.org/series/58401/
State : failure
== Summary ==
Applying: i915/gem_exec_latency: Measure the latency of context switching
Applying: lib: Add GPU power measurement
Using index info to reconstruct a base tree...
M lib/Makefile.am
M lib/Makefile.sources
M lib/meson.build
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in lib/igt_gpu_power.h
Auto-merging lib/igt_gpu_power.h
CONFLICT (add/add): Merge conflict in lib/igt_gpu_power.c
Auto-merging lib/igt_gpu_power.c
Patch failed at 0002 lib: Add GPU power measurement
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-03-26 11:00 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-22 9:21 [igt-dev] [PATCH i-g-t 01/24] i915/gem_exec_latency: Measure the latency of context switching Chris Wilson
2019-03-22 9:21 ` [Intel-gfx] [PATCH i-g-t 02/24] lib: Add GPU power measurement Chris Wilson
2019-03-26 8:36 ` [igt-dev] " Tvrtko Ursulin
2019-03-26 8:49 ` Chris Wilson
2019-03-26 9:18 ` [igt-dev] [PATCH i-g-t v2] " Chris Wilson
2019-03-26 9:52 ` Tvrtko Ursulin
2019-03-26 10:06 ` Chris Wilson
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 03/24] i915/gem_exec_schedule: Measure semaphore power consumption Chris Wilson
2019-03-26 8:46 ` [Intel-gfx] " Tvrtko Ursulin
2019-03-26 9:23 ` Chris Wilson
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 04/24] i915/gem_exec_whisper: Measure total power consumed Chris Wilson
2019-03-26 8:47 ` Tvrtko Ursulin
2019-03-22 9:21 ` [Intel-gfx] [PATCH i-g-t 05/24] i915/gem_exec_schedule: Verify that using HW semaphores doesn't block Chris Wilson
2019-03-26 9:19 ` [igt-dev] " Tvrtko Ursulin
2019-03-26 10:03 ` [Intel-gfx] " Chris Wilson
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 06/24] i915/gem_exec_nop: poll-sequential requires ordering between rings Chris Wilson
2019-03-26 9:38 ` Tvrtko Ursulin
2019-03-22 9:21 ` [Intel-gfx] [PATCH i-g-t 07/24] i915/gem_sync: Make switch-default asymmetric Chris Wilson
2019-03-26 9:57 ` [Intel-gfx] [igt-dev] " Tvrtko Ursulin
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 08/24] i915/gem_ctx_param: Remove kneecapping Chris Wilson
2019-03-26 9:58 ` Tvrtko Ursulin
2019-03-22 9:21 ` [Intel-gfx] [PATCH i-g-t 09/24] i915/gem_exec_big: Add a single shot test Chris Wilson
2019-03-26 10:06 ` [igt-dev] " Tvrtko Ursulin
2019-03-26 10:21 ` Chris Wilson
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 10/24] kms_fence_pin_leak: Ask for the GPU before use Chris Wilson
2019-03-26 10:10 ` Tvrtko Ursulin
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 11/24] drm-uapi: Import i915_drm.h upto 53073249452d Chris Wilson
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 12/24] lib/i915: Improve gem_context error messages Chris Wilson
2019-03-26 10:14 ` Tvrtko Ursulin
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 13/24] i915/gem_ctx_param: Test set/get (copy) VM Chris Wilson
2019-03-26 10:22 ` Tvrtko Ursulin
2019-03-26 10:33 ` Tvrtko Ursulin
2019-03-26 10:51 ` Chris Wilson
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 14/24] i915/gem_ctx_create: Basic checks for constructor properties Chris Wilson
2019-03-26 10:46 ` Tvrtko Ursulin
2019-03-26 11:06 ` [Intel-gfx] " Chris Wilson
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 15/24] i915: Add gem_vm_create Chris Wilson
2019-03-26 11:21 ` Tvrtko Ursulin
2019-03-26 11:37 ` Chris Wilson
2019-03-26 11:48 ` Tvrtko Ursulin
2019-03-26 14:11 ` Chris Wilson
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 16/24] drm-uapi: Import i915_drm.h upto 364df3d04d51 Chris Wilson
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 17/24] i915: Add gem_ctx_clone Chris Wilson
2019-03-26 15:44 ` Tvrtko Ursulin
2019-03-26 15:49 ` Chris Wilson
2019-03-26 15:54 ` Chris Wilson
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 18/24] i915: Exercise creating context with shared GTT Chris Wilson
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 19/24] i915/gem_ctx_switch: Exercise queues Chris Wilson
2019-03-22 9:21 ` [Intel-gfx] [PATCH i-g-t 20/24] i915/gem_exec_whisper: Fork all-engine tests one-per-engine Chris Wilson
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 21/24] i915/gem_exec_whisper: debugfs/next_seqno is defunct Chris Wilson
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 22/24] i915: Add gem_ctx_engines Chris Wilson
2019-03-22 16:40 ` Andi Shyti
2019-03-22 16:48 ` Chris Wilson
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 23/24] i915: Add gem_exec_balancer Chris Wilson
2019-03-22 9:21 ` [igt-dev] [PATCH i-g-t 24/24] i915/gem_exec_balancer: Exercise bonded pairs Chris Wilson
2019-03-22 10:22 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,01/24] i915/gem_exec_latency: Measure the latency of context switching Patchwork
2019-03-23 6:38 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2019-03-26 11:00 ` 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=20190326110029.29940.50589@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