From: Patchwork <patchwork@emeril.freedesktop.org>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: igt-dev@lists.freedesktop.org
Subject: [igt-dev] ✗ Fi.CI.BAT: failure for i915/gem_sparseobject: Add sparse object IGT tests (rev2)
Date: Thu, 21 Mar 2019 01:10:07 -0000 [thread overview]
Message-ID: <20190321011007.27756.91917@emeril.freedesktop.org> (raw)
In-Reply-To: <20190320200134.72790-1-venkata.s.dhanalakota@intel.com>
== Series Details ==
Series: i915/gem_sparseobject: Add sparse object IGT tests (rev2)
URL : https://patchwork.freedesktop.org/series/58290/
State : failure
== Summary ==
Applying: i915/gem_sparseobject: Add sparse object IGT tests
Using index info to reconstruct a base tree...
M include/drm-uapi/i915_drm.h
M lib/Makefile.sources
M lib/meson.build
M tests/Makefile.sources
M tests/meson.build
Falling back to patching base and 3-way merge...
Auto-merging tests/meson.build
Auto-merging tests/Makefile.sources
Auto-merging lib/meson.build
Auto-merging lib/Makefile.sources
Auto-merging include/drm-uapi/i915_drm.h
CONFLICT (content): Merge conflict in include/drm-uapi/i915_drm.h
Patch failed at 0001 i915/gem_sparseobject: Add sparse object IGT tests
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".
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2019-03-21 1:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-20 20:01 [igt-dev] [PATCH i-g-t] i915/gem_sparseobject: Add sparse object IGT tests Venkata Sandeep Dhanalakota
2019-03-20 21:41 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2019-03-21 0:13 ` [PATCH i-g-t] " Chris Wilson
2019-03-21 0:13 ` [igt-dev] " Chris Wilson
2019-03-22 14:09 ` Venkata Sandeep Dhanalakota
2019-03-21 1:10 ` Patchwork [this message]
2019-03-21 5:14 ` [igt-dev] ✓ Fi.CI.IGT: success for " Patchwork
2019-03-22 15:10 ` [igt-dev] ✓ Fi.CI.BAT: success for i915/gem_sparseobject: Add sparse object IGT tests (rev3) Patchwork
2019-03-23 14:17 ` [igt-dev] ✓ Fi.CI.IGT: " 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=20190321011007.27756.91917@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=chris@chris-wilson.co.uk \
--cc=igt-dev@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 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.