From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [01/20] drm/i915: Drop inspection of execbuf flags during evict
Date: Wed, 26 Feb 2020 17:02:20 -0000 [thread overview]
Message-ID: <158273654018.21010.6094768891321301726@emeril.freedesktop.org> (raw)
In-Reply-To: <20200225143824.1858038-1-maarten.lankhorst@linux.intel.com>
== Series Details ==
Series: series starting with [01/20] drm/i915: Drop inspection of execbuf flags during evict
URL : https://patchwork.freedesktop.org/series/73915/
State : failure
== Summary ==
Applying: drm/i915: Drop inspection of execbuf flags during evict
Applying: drm/i915/gem: Extract transient execbuf flags from i915_vma
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_execbuffer.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/gem: Extract transient execbuf flags from i915_vma
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
prev parent reply other threads:[~2020-02-26 17:02 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-25 14:38 [Intel-gfx] [PATCH 01/20] drm/i915: Drop inspection of execbuf flags during evict Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 02/20] drm/i915/gem: Extract transient execbuf flags from i915_vma Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 03/20] drm/i915: Separate lookup and pinning in execbuf Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 04/20] drm/i915: Add an implementation for i915_gem_ww_ctx locking, v2 Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 05/20] drm/i915: Remove locking from i915_gem_object_prepare_read/write Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 06/20] drm/i915: Parse command buffer earlier in eb_relocate(slow) Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 07/20] drm/i915: Use per object locking in execbuf on top of struct_mutex, v4 Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 08/20] drm/i915: Use ww locking in intel_renderstate Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 09/20] drm/i915: Add ww context handling to context_barrier_task Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 10/20] drm/i915: Nuke arguments to eb_pin_engine Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 11/20] drm/i915: Pin engine before pinning all objects, v3 Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 12/20] drm/i915: Rework intel_context pinning to do everything outside of pin_mutex Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 13/20] drm/i915: Make sure execbuffer always passes ww state to i915_vma_pin Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 14/20] drm/i915: Convert i915_gem_object/client_blt.c to use ww locking as well, v2 Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 15/20] drm/i915: Kill last user of intel_context_create_request outside of selftests Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 16/20] drm/i915: Convert i915_perf to ww locking as well Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 17/20] drm/i915: Dirty hack to fix selftests locking inversion Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 18/20] drm/i915/selftests: Fix locking inversion in lrc selftest Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 19/20] drm/i915: Use ww pinning for intel_context_create_request() Maarten Lankhorst
2020-02-25 14:38 ` [Intel-gfx] [PATCH 20/20] drm/i915: Move i915_vma_lock in the live selftest to avoid lock inversion Maarten Lankhorst
2020-02-26 17:02 ` 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=158273654018.21010.6094768891321301726@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@linux.intel.com \
/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.