From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Kahola, Mika" <mika.kahola@intel.com>
Cc: igt-dev@lists.freedesktop.org
Subject: [igt-dev] ✗ Fi.CI.BUILD: failure for tests/kms_concurrent: Test maximum number of planes supported by the platform (rev4)
Date: Fri, 27 Mar 2020 12:07:40 -0000 [thread overview]
Message-ID: <158531086004.17237.12929166077507543366@emeril.freedesktop.org> (raw)
In-Reply-To: <20200326135322.9958-1-mika.kahola@intel.com>
== Series Details ==
Series: tests/kms_concurrent: Test maximum number of planes supported by the platform (rev4)
URL : https://patchwork.freedesktop.org/series/75104/
State : failure
== Summary ==
Applying: tests/kms_concurrent: Test maximum number of planes supported by the platform
Using index info to reconstruct a base tree...
M tests/kms_concurrent.c
Falling back to patching base and 3-way merge...
Auto-merging tests/kms_concurrent.c
CONFLICT (content): Merge conflict in tests/kms_concurrent.c
Patch failed at 0001 tests/kms_concurrent: Test maximum number of planes supported by the platform
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:[~2020-03-27 12:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 13:53 [igt-dev] [PATCH i-g-t v3 0/2] tests/kms_concurrent: Test maximum number of planes supported by the platform Mika Kahola
2020-03-26 13:53 ` [igt-dev] [PATCH i-g-t v3 1/2] " Mika Kahola
2020-03-27 8:05 ` Lisovskiy, Stanislav
2020-03-26 13:53 ` [igt-dev] [PATCH i-g-t v3 2/2] tests/kms_concurrent: Plug possible memory leaks Mika Kahola
2020-03-27 8:01 ` Lisovskiy, Stanislav
2020-03-27 10:05 ` Kahola, Mika
2020-03-26 14:40 ` [igt-dev] [PATCH i-g-t v3 0/2] tests/kms_concurrent: Test maximum number of planes supported by the platform Juha-Pekka Heikkila
2020-03-26 17:09 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_concurrent: Test maximum number of planes supported by the platform (rev3) Patchwork
2020-03-27 10:05 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2020-03-27 10:24 ` Petri Latvala
2020-03-27 11:45 ` Kahola, Mika
2020-03-27 12:34 ` Petri Latvala
2020-03-27 12:35 ` Kahola, Mika
2020-03-27 12:36 ` Kahola, Mika
2020-03-27 13:17 ` Kahola, Mika
2020-03-27 12:07 ` 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=158531086004.17237.12929166077507543366@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=igt-dev@lists.freedesktop.org \
--cc=mika.kahola@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 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.