From: Patchwork <patchwork@emeril.freedesktop.org>
To: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: igt-dev@lists.freedesktop.org
Subject: [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/4] gitlab-ci: Parametrize images used with CI_ variables
Date: Wed, 24 Oct 2018 17:58:12 -0000 [thread overview]
Message-ID: <20181024175812.6733.38383@emeril.freedesktop.org> (raw)
In-Reply-To: <20181024130004.12770-1-arkadiusz.hiler@intel.com>
== Series Details ==
Series: series starting with [i-g-t,1/4] gitlab-ci: Parametrize images used with CI_ variables
URL : https://patchwork.freedesktop.org/series/51451/
State : failure
== Summary ==
Applying: gitlab-ci: Parametrize images used with CI_ variables
Using index info to reconstruct a base tree...
M .gitlab-ci.yml
Falling back to patching base and 3-way merge...
Auto-merging .gitlab-ci.yml
CONFLICT (content): Merge conflict in .gitlab-ci.yml
Patch failed at 0001 gitlab-ci: Parametrize images used with CI_ variables
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
prev parent reply other threads:[~2018-10-24 17:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-24 13:00 [igt-dev] [PATCH i-g-t 1/4] gitlab-ci: Parametrize images used with CI_ variables Arkadiusz Hiler
2018-10-24 13:00 ` [igt-dev] [PATCH i-g-t 2/4] gitlab-ci: Compile using autotools Arkadiusz Hiler
2018-10-24 13:07 ` Daniel Vetter
2018-10-24 16:15 ` Arkadiusz Hiler
2018-10-24 13:00 ` [igt-dev] [PATCH i-g-t 3/4] gitlab-ci: Compare test-list.txt(s) generated by meson and autotools Arkadiusz Hiler
2018-10-24 13:00 ` [igt-dev] [PATCH i-g-t 4/4] gitlab-ci: Do meson build with oldest supported meson Arkadiusz Hiler
2018-10-24 13:07 ` Daniel Vetter
2018-10-24 17:58 ` 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=20181024175812.6733.38383@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=arkadiusz.hiler@intel.com \
--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.