From: Patchwork <patchwork@emeril.freedesktop.org>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for kms_vblank: Move tests over from kms_flip.
Date: Thu, 04 Jan 2018 13:36:51 -0000 [thread overview]
Message-ID: <20180104133651.12480.71206@emeril.freedesktop.org> (raw)
In-Reply-To: <20180104131509.10198-1-maarten.lankhorst@linux.intel.com>
== Series Details ==
Series: kms_vblank: Move tests over from kms_flip.
URL : https://patchwork.freedesktop.org/series/36006/
State : failure
== Summary ==
Applying: tests/kms_flip: Remove blt/rcs flip tests.
Using index info to reconstruct a base tree...
M tests/kms_flip.c
Falling back to patching base and 3-way merge...
Auto-merging tests/kms_flip.c
CONFLICT (content): Merge conflict in tests/kms_flip.c
Patch failed at 0001 tests/kms_flip: Remove blt/rcs flip tests.
The copy of the patch that failed is found in: .git/rebase-apply/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".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2018-01-04 13:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-04 13:15 [PATCH i-g-t 0/7] kms_vblank: Move tests over from kms_flip Maarten Lankhorst
2018-01-04 13:15 ` [PATCH i-g-t 1/7] tests/kms_flip: Remove blt/rcs flip tests Maarten Lankhorst
2018-01-04 13:15 ` [PATCH i-g-t 2/7] tests/kms_flip: Move kms_flip.vblank-vs-hang to kms_vblank Maarten Lankhorst
2018-01-04 13:15 ` [PATCH i-g-t 3/7] kms_vblank: Reorganize subtests by pipe Maarten Lankhorst
2018-01-04 13:15 ` [PATCH i-g-t 4/7] kms_vblank: Make the -hang tests work as intended Maarten Lankhorst
2018-01-04 13:15 ` [PATCH i-g-t 5/7] kms_vblank: Add tests implemented in kms_flip Maarten Lankhorst
2018-01-04 13:15 ` [PATCH i-g-t 6/7] kms_flip: Remove redundant vblank tests Maarten Lankhorst
2018-01-04 13:15 ` [PATCH i-g-t 7/7] kms_vblank: Remove teardown code from cleanup_crtc Maarten Lankhorst
2018-01-04 13:36 ` 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=20180104133651.12480.71206@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox