From: Andi Shyti <andi.shyti@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/gt: Consider multi-gt at all places (rev2)
Date: Wed, 22 Mar 2023 00:24:51 +0100 [thread overview]
Message-ID: <ZBo8wz7upfeYky9S@ashyti-mobl2.lan> (raw)
In-Reply-To: <167940669606.18680.12249285464884109493@emeril.freedesktop.org>
Hi Tejas,
On Tue, Mar 21, 2023 at 01:51:36PM -0000, Patchwork wrote:
> == Series Details ==
>
> Series: drm/i915/gt: Consider multi-gt at all places (rev2)
> URL : https://patchwork.freedesktop.org/series/115302/
> State : failure
>
> == Summary ==
>
> Error: patch https://patchwork.freedesktop.org/api/1.0/series/115302/revisions/2/mbox/ not applied
> Applying: drm/i915/gt: Consider multi-gt at all places
> 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=diff' to see the failed patch
> Patch failed at 0001 drm/i915/gt: Consider multi-gt at all places
> 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".
> Build failed, no error log produced
I think you need a rebase here.
Andi
next prev parent reply other threads:[~2023-03-21 23:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-17 5:52 [Intel-gfx] [PATCH] drm/i915/gt: Consider multi-gt at all places Tejas Upadhyay
2023-03-17 8:22 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
2023-03-17 9:16 ` [Intel-gfx] [PATCH] " Tvrtko Ursulin
2023-03-21 23:33 ` Andi Shyti
2023-04-05 6:56 ` Upadhyay, Tejas
2023-04-05 8:30 ` Tvrtko Ursulin
2023-04-17 18:13 ` Upadhyay, Tejas
2023-04-18 7:32 ` Tvrtko Ursulin
2023-03-20 0:24 ` Andi Shyti
2023-03-21 13:51 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/gt: Consider multi-gt at all places (rev2) Patchwork
2023-03-21 23:24 ` Andi Shyti [this message]
2023-04-17 20:40 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/gt: Consider multi-gt at all places (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=ZBo8wz7upfeYky9S@ashyti-mobl2.lan \
--to=andi.shyti@linux.intel.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox