All of lore.kernel.org
 help / color / mirror / Atom feed
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 RFC: i915: Drop relocation support on Gen12+
Date: Thu, 07 May 2020 16:27:52 -0000	[thread overview]
Message-ID: <158886887290.2191.12892597364269835554@emeril.freedesktop.org> (raw)
In-Reply-To: <20200507153600.314454-1-jason@jlekstrand.net>

== Series Details ==

Series: RFC: i915: Drop relocation support on Gen12+
URL   : https://patchwork.freedesktop.org/series/77048/
State : failure

== Summary ==

Applying: RFC: i915: Drop relocation support on Gen12+
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 RFC: i915: Drop relocation support on Gen12+
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

  parent reply	other threads:[~2020-05-07 16:27 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-07 15:36 [PATCH] RFC: i915: Drop relocation support on Gen12+ Jason Ekstrand
2020-05-07 15:36 ` [Intel-gfx] " Jason Ekstrand
2020-05-07 15:44 ` Chris Wilson
2020-05-07 15:44   ` [Intel-gfx] " Chris Wilson
2020-05-07 16:00   ` Jason Ekstrand
2020-05-07 16:00     ` [Intel-gfx] " Jason Ekstrand
2020-05-07 18:27   ` Dave Airlie
2020-05-07 18:27     ` [Intel-gfx] " Dave Airlie
2020-05-08  5:58     ` Joonas Lahtinen
2020-05-08  5:58       ` [Intel-gfx] " Joonas Lahtinen
2020-06-25 17:22       ` Dave Airlie
2020-06-25 17:22         ` [Intel-gfx] " Dave Airlie
2020-05-07 16:27 ` Patchwork [this message]
2021-03-10 21:26 ` [PATCH] i915: Drop relocation support on all new hardware Jason Ekstrand
2021-03-10 21:26   ` [Intel-gfx] " Jason Ekstrand
2021-03-10 21:50   ` [PATCH] i915: Drop relocation support on all new hardware (v3) Jason Ekstrand
2021-03-10 21:50     ` [Intel-gfx] " Jason Ekstrand
2021-03-10 22:56     ` Jason Ekstrand
2021-03-10 22:56       ` [Intel-gfx] " Jason Ekstrand
2021-03-11  8:14     ` Lucas De Marchi
2021-03-11  8:14       ` Lucas De Marchi
2021-03-11 10:20       ` Matthew Auld
2021-03-11 10:20         ` Matthew Auld
2021-03-11  9:54     ` Tvrtko Ursulin
2021-03-11  9:54       ` Tvrtko Ursulin
2021-03-11 11:44     ` Zbigniew Kempczyński
2021-03-11 11:44       ` [Intel-gfx] " Zbigniew Kempczyński
2021-03-11 15:50       ` Jason Ekstrand
2021-03-11 15:50         ` [Intel-gfx] " Jason Ekstrand
2021-03-11 15:57         ` Daniel Vetter
2021-03-11 15:57           ` [Intel-gfx] " Daniel Vetter
2021-03-11 16:24           ` Jason Ekstrand
2021-03-11 16:24             ` [Intel-gfx] " Jason Ekstrand
2021-03-11 16:50             ` Zbigniew Kempczyński
2021-03-11 16:50               ` [Intel-gfx] " Zbigniew Kempczyński
2021-03-11 17:18               ` Jason Ekstrand
2021-03-11 17:18                 ` [Intel-gfx] " Jason Ekstrand
2021-03-11 18:19                 ` Zbigniew Kempczyński
2021-03-11 18:19                   ` [Intel-gfx] " Zbigniew Kempczyński
2021-03-11 18:57                   ` Jason Ekstrand
2021-03-11 18:57                     ` [Intel-gfx] " Jason Ekstrand
2021-03-12 14:16                     ` Daniel Vetter
2021-03-12 14:16                       ` [Intel-gfx] " Daniel Vetter
2021-03-11 16:31       ` Chris Wilson
2021-03-11 16:31         ` [Intel-gfx] " Chris Wilson
2021-03-11 16:40         ` Jason Ekstrand
2021-03-11 16:40           ` [Intel-gfx] " Jason Ekstrand
2021-03-11 16:26     ` [PATCH] drm/i915/gem: Drop relocation support on all new hardware (v4) Jason Ekstrand
2021-03-11 18:17     ` [Intel-gfx] " Jason Ekstrand
2021-03-12  9:28       ` Zbigniew Kempczyński
2021-03-12  9:50       ` Tvrtko Ursulin
2021-03-12 10:56         ` Matthew Auld
2021-03-12 11:33           ` Maarten Lankhorst
2021-03-12 11:52             ` Tvrtko Ursulin
2021-03-12 11:47           ` Tvrtko Ursulin
2021-03-12 12:16             ` Matthew Auld
2021-03-12 14:52               ` Jason Ekstrand
2021-03-12 15:20                 ` Tvrtko Ursulin
2021-03-10 21:42 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for RFC: i915: Drop relocation support on Gen12+ (rev2) Patchwork
2021-03-10 22:11 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-03-10 23:47 ` [Intel-gfx] ✓ Fi.CI.BAT: success for RFC: i915: Drop relocation support on Gen12+ (rev3) Patchwork
2021-03-11  2:32 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-03-11 18:41 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for RFC: i915: Drop relocation support on Gen12+ (rev4) Patchwork
2021-03-11 19:10 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " 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=158886887290.2191.12892597364269835554@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 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.