From: Patchwork <patchwork@emeril.freedesktop.org>
To: Petri Latvala <petri.latvala@intel.com>
Cc: igt-dev@lists.freedesktop.org
Subject: [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/1] meson: Fixup gem_mocs_settings
Date: Fri, 27 Jul 2018 13:42:54 -0000 [thread overview]
Message-ID: <20180727134254.31050.938@emeril.freedesktop.org> (raw)
In-Reply-To: <20180727133948.24653-1-petri.latvala@intel.com>
== Series Details ==
Series: series starting with [i-g-t,1/1] meson: Fixup gem_mocs_settings
URL : https://patchwork.freedesktop.org/series/47345/
State : failure
== Summary ==
Applying: meson: Fixup gem_mocs_settings
Using index info to reconstruct a base tree...
M tests/meson.build
Falling back to patching base and 3-way merge...
Auto-merging tests/meson.build
CONFLICT (content): Merge conflict in tests/meson.build
Patch failed at 0001 meson: Fixup gem_mocs_settings
Use 'git am --show-current-patch' to see the failed patch
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:[~2018-07-27 13:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-27 13:39 [igt-dev] [PATCH i-g-t 1/1] meson: Fixup gem_mocs_settings Petri Latvala
2018-07-27 13:42 ` Patchwork [this message]
2018-07-27 13:43 ` Arkadiusz Hiler
2018-07-27 13:46 ` Petri Latvala
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=20180727134254.31050.938@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=igt-dev@lists.freedesktop.org \
--cc=petri.latvala@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;
as well as URLs for NNTP newsgroup(s).