From: Patchwork <patchwork@emeril.freedesktop.org>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BUILD: failure for series starting with [01/10] drm/i915: Note the addition of timeslicing to the pretend scheduler (rev2)
Date: Fri, 11 Oct 2019 09:49:32 -0000 [thread overview]
Message-ID: <20191011094932.18210.24442@emeril.freedesktop.org> (raw)
In-Reply-To: <20191010071434.31195-1-chris@chris-wilson.co.uk>
== Series Details ==
Series: series starting with [01/10] drm/i915: Note the addition of timeslicing to the pretend scheduler (rev2)
URL : https://patchwork.freedesktop.org/series/67827/
State : failure
== Summary ==
Applying: drm/i915: Note the addition of timeslicing to the pretend scheduler
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_scheduler_types.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915/execlists: Leave tell-tales as to why pending[] is bad
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/intel_lrc.c
M drivers/gpu/drm/i915/i915_gem.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_gem.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.h
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 drm/i915/execlists: Leave tell-tales as to why pending[] is bad
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:[~2019-10-11 9:49 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-10 7:14 [PATCH 01/10] drm/i915: Note the addition of timeslicing to the pretend scheduler Chris Wilson
2019-10-10 7:14 ` [PATCH 02/10] drm/i915/execlists: Leave tell-tales as to why pending[] is bad Chris Wilson
2019-10-11 8:39 ` Tvrtko Ursulin
2019-10-10 7:14 ` [PATCH 03/10] drm/i915: Expose engine properties via sysfs Chris Wilson
2019-10-11 8:44 ` Tvrtko Ursulin
2019-10-11 8:49 ` Chris Wilson
2019-10-11 9:04 ` Tvrtko Ursulin
2019-10-11 9:40 ` [PATCH v2] " Chris Wilson
2019-10-10 7:14 ` [PATCH 04/10] drm/i915/execlists: Force preemption Chris Wilson
2019-10-10 7:14 ` [PATCH 05/10] drm/i915: Mark up "sentinel" requests Chris Wilson
2019-10-11 8:45 ` Tvrtko Ursulin
2019-10-10 7:14 ` [PATCH 06/10] drm/i915/gt: Introduce barrier pulses along engines Chris Wilson
2019-10-11 9:11 ` Tvrtko Ursulin
2019-10-11 9:52 ` Chris Wilson
2019-10-10 7:14 ` [PATCH 07/10] drm/i915/execlists: Cancel banned contexts on schedule-out Chris Wilson
2019-10-11 9:47 ` Tvrtko Ursulin
2019-10-11 10:03 ` Chris Wilson
2019-10-11 10:15 ` Chris Wilson
2019-10-11 10:40 ` Chris Wilson
2019-10-11 11:16 ` [PATCH v2] " Chris Wilson
2019-10-11 13:10 ` Tvrtko Ursulin
2019-10-11 14:10 ` Chris Wilson
2019-10-10 7:14 ` [PATCH 08/10] drm/i915: Cancel non-persistent contexts on close Chris Wilson
2019-10-11 13:55 ` Tvrtko Ursulin
2019-10-11 14:22 ` Chris Wilson
2019-10-11 15:41 ` Chris Wilson
2019-10-10 7:14 ` [PATCH 09/10] drm/i915: Replace hangcheck by heartbeats Chris Wilson
2019-10-11 14:24 ` Tvrtko Ursulin
2019-10-11 15:06 ` Chris Wilson
2019-10-10 7:14 ` [PATCH 10/10] drm/i915: Flush idle barriers when waiting Chris Wilson
2019-10-11 14:56 ` Tvrtko Ursulin
2019-10-11 15:11 ` Chris Wilson
2019-10-14 13:08 ` Tvrtko Ursulin
2019-10-14 13:38 ` Chris Wilson
2019-10-23 15:33 ` Chris Wilson
2019-10-23 15:33 ` [Intel-gfx] " Chris Wilson
2019-10-10 8:18 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/10] drm/i915: Note the addition of timeslicing to the pretend scheduler Patchwork
2019-10-10 8:42 ` ✓ Fi.CI.BAT: success " Patchwork
2019-10-10 16:19 ` ✗ Fi.CI.IGT: failure " Patchwork
2019-10-11 8:16 ` [PATCH 01/10] " Tvrtko Ursulin
2019-10-11 9:49 ` Patchwork [this message]
2019-10-11 11:39 ` ✗ Fi.CI.BUILD: failure for series starting with [01/10] drm/i915: Note the addition of timeslicing to the pretend scheduler (rev3) 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=20191011094932.18210.24442@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.