From: Patchwork <patchwork@emeril.freedesktop.org>
To: Matthew Auld <matthew.auld@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BUILD: failure for series starting with [v3,1/3] drm/i915: enumerate and init each supported region
Date: Fri, 18 Oct 2019 12:41:49 -0000 [thread overview]
Message-ID: <20191018124149.27985.26257@emeril.freedesktop.org> (raw)
In-Reply-To: <20191018104450.19100-1-matthew.auld@intel.com>
== Series Details ==
Series: series starting with [v3,1/3] drm/i915: enumerate and init each supported region
URL : https://patchwork.freedesktop.org/series/68189/
State : failure
== Summary ==
Applying: drm/i915: enumerate and init each supported region
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_drv.h
M drivers/gpu/drm/i915/i915_gem_gtt.c
M drivers/gpu/drm/i915/intel_device_info.h
M drivers/gpu/drm/i915/intel_memory_region.h
M drivers/gpu/drm/i915/selftests/mock_gem_device.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c
Auto-merging drivers/gpu/drm/i915/intel_memory_region.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_memory_region.h
Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 drm/i915: enumerate and init each supported region
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:[~2019-10-18 12:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-18 10:44 [PATCH v3 1/3] drm/i915: enumerate and init each supported region Matthew Auld
2019-10-18 10:44 ` [PATCH v3 2/3] drm/i915: treat shmem as a region Matthew Auld
2019-10-18 10:44 ` [PATCH v3 3/3] drm/i915: treat stolen " Matthew Auld
2019-10-18 11:44 ` Chris Wilson
2019-10-18 12:41 ` 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=20191018124149.27985.26257@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=matthew.auld@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox