From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Jason Ekstrand" <jason@jlekstrand.net>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/gem: ioctl clean-ups (rev5)
Date: Thu, 27 May 2021 21:17:14 -0000 [thread overview]
Message-ID: <162215023468.12240.13519807383762020998@emeril.freedesktop.org> (raw)
In-Reply-To: <20210527162650.1182544-1-jason@jlekstrand.net>
== Series Details ==
Series: drm/i915/gem: ioctl clean-ups (rev5)
URL : https://patchwork.freedesktop.org/series/89443/
State : failure
== Summary ==
Applying: drm/i915: Drop I915_CONTEXT_PARAM_RINGSIZE
Applying: drm/i915: Stop storing the ring size in the ring pointer (v2)
Applying: drm/i915: Drop I915_CONTEXT_PARAM_NO_ZEROMAP
Applying: drm/i915/gem: Set the watchdog timeout directly in intel_context_set_gem (v2)
Applying: drm/i915/gem: Return void from context_apply_all
Applying: drm/i915: Drop the CONTEXT_CLONE API (v2)
Applying: drm/i915: Implement SINGLE_TIMELINE with a syncobj (v4)
Applying: drm/i915: Drop getparam support for I915_CONTEXT_PARAM_ENGINES
Applying: drm/i915/gem: Disallow bonding of virtual engines (v3)
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/intel_execlists_submission.c
M drivers/gpu/drm/i915/gt/intel_execlists_submission.h
M drivers/gpu/drm/i915/gt/selftest_execlists.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/selftest_execlists.c
Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_execlists_submission.h
Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0009 drm/i915/gem: Disallow bonding of virtual engines (v3)
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:[~2021-05-27 21:17 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-27 16:26 [Intel-gfx] [PATCH 00/29] drm/i915/gem: ioctl clean-ups (v6) Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 01/29] drm/i915: Drop I915_CONTEXT_PARAM_RINGSIZE Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 02/29] drm/i915: Stop storing the ring size in the ring pointer (v2) Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 03/29] drm/i915: Drop I915_CONTEXT_PARAM_NO_ZEROMAP Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 04/29] drm/i915/gem: Set the watchdog timeout directly in intel_context_set_gem (v2) Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 05/29] drm/i915/gem: Return void from context_apply_all Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 06/29] drm/i915: Drop the CONTEXT_CLONE API (v2) Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 07/29] drm/i915: Implement SINGLE_TIMELINE with a syncobj (v4) Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 08/29] drm/i915: Drop getparam support for I915_CONTEXT_PARAM_ENGINES Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 09/29] drm/i915/gem: Disallow bonding of virtual engines (v3) Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 10/29] drm/i915/gem: Remove engine auto-magic with FENCE_SUBMIT (v2) Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 11/29] drm/i915/request: Remove the hook from await_execution Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 12/29] drm/i915/gem: Disallow creating contexts with too many engines Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 13/29] drm/i915: Stop manually RCU banging in reset_stats_ioctl (v2) Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 14/29] drm/i915/gem: Add a separate validate_priority helper Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 15/29] drm/i915: Add gem/i915_gem_context.h to the docs Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 16/29] drm/i915/gem: Add an intermediate proto_context struct Jason Ekstrand
2021-05-31 8:47 ` Daniel Vetter
2021-06-02 21:24 ` Jason Ekstrand
2021-06-03 7:09 ` Daniel Vetter
2021-05-27 16:26 ` [Intel-gfx] [PATCH 17/29] drm/i915/gem: Rework error handling in default_engines Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 18/29] drm/i915/gem: Optionally set SSEU in intel_context_set_gem Jason Ekstrand
2021-05-31 8:48 ` Daniel Vetter
2021-06-02 22:05 ` Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 19/29] drm/i915: Add an i915_gem_vm_lookup helper Jason Ekstrand
2021-05-27 18:30 ` Daniel Vetter
2021-05-27 16:26 ` [Intel-gfx] [PATCH 20/29] drm/i915/gem: Make an alignment check more sensible Jason Ekstrand
2021-05-27 18:31 ` Daniel Vetter
2021-05-27 16:26 ` [Intel-gfx] [PATCH 21/29] drm/i915/gem: Use the proto-context to handle create parameters (v2) Jason Ekstrand
2021-05-31 9:11 ` Daniel Vetter
2021-06-02 22:23 ` Jason Ekstrand
2021-06-03 7:32 ` Daniel Vetter
2021-06-03 16:29 ` Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 22/29] drm/i915/gem: Return an error ptr from context_lookup Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 23/29] drm/i915/gt: Drop i915_address_space::file (v2) Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 24/29] drm/i915/gem: Delay context creation Jason Ekstrand
2021-05-31 9:50 ` Daniel Vetter
2021-06-02 22:55 ` Jason Ekstrand
2021-06-03 7:26 ` Daniel Vetter
2021-05-27 16:26 ` [Intel-gfx] [PATCH 25/29] drm/i915/gem: Don't allow changing the VM on running contexts (v2) Jason Ekstrand
2021-05-31 14:08 ` Daniel Vetter
2021-05-27 16:26 ` [Intel-gfx] [PATCH 26/29] drm/i915/gem: Don't allow changing the engine set " Jason Ekstrand
2021-05-31 13:58 ` Daniel Vetter
2021-05-27 16:26 ` [Intel-gfx] [PATCH 27/29] drm/i915/selftests: Take a VM in kernel_context() Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 28/29] i915/gem/selftests: Assign the VM at context creation in igt_shared_ctx_exec Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] [PATCH 29/29] drm/i915/gem: Roll all of context creation together Jason Ekstrand
2021-05-31 14:18 ` Daniel Vetter
2021-05-27 21:17 ` 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=162215023468.12240.13519807383762020998@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jason@jlekstrand.net \
/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;
as well as URLs for NNTP newsgroup(s).