From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/ttm: Calculate the object placement at get_pages time (rev2)
Date: Wed, 16 Jun 2021 19:21:15 -0000 [thread overview]
Message-ID: <162387127504.8275.6694608830654729706@emeril.freedesktop.org> (raw)
In-Reply-To: <20210616151726.52762-1-thomas.hellstrom@linux.intel.com>
== Series Details ==
Series: drm/i915/ttm: Calculate the object placement at get_pages time (rev2)
URL : https://patchwork.freedesktop.org/series/91586/
State : failure
== Summary ==
Applying: drm/i915/ttm: Calculate the object placement at get_pages time
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gem/i915_gem_ttm.c
M drivers/gpu/drm/i915/intel_region_ttm.c
M drivers/gpu/drm/i915/intel_region_ttm.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_region_ttm.h
Auto-merging drivers/gpu/drm/i915/intel_region_ttm.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_ttm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_ttm.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/ttm: Calculate the object placement at get_pages time
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-06-16 19:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 15:17 [Intel-gfx] [PATCH] drm/i915/ttm: Calculate the object placement at get_pages time Thomas Hellström
2021-06-16 19:21 ` 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=162387127504.8275.6694608830654729706@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=thomas.hellstrom@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.