[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/gt: Consider multi-gt at all places (rev2)

[Andi Shyti]

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