From: Patchwork <patchwork@emeril.freedesktop.org>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: igt-dev@lists.freedesktop.org
Subject: [igt-dev] ✗ Fi.CI.BAT: failure for lib/igt_fb: better format printing
Date: Tue, 12 Mar 2019 09:50:31 -0000 [thread overview]
Message-ID: <20190312095031.22353.51207@emeril.freedesktop.org> (raw)
In-Reply-To: <20190311164743.13822-1-daniel.vetter@ffwll.ch>
== Series Details ==
Series: lib/igt_fb: better format printing
URL : https://patchwork.freedesktop.org/series/57845/
State : failure
== Summary ==
Applying: lib/igt_fb: better format printing
Using index info to reconstruct a base tree...
M lib/igt_fb.c
M lib/igt_fb.h
Falling back to patching base and 3-way merge...
Auto-merging lib/igt_fb.h
Auto-merging lib/igt_fb.c
CONFLICT (content): Merge conflict in lib/igt_fb.c
Patch failed at 0001 lib/igt_fb: better format printing
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-12 9:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-11 16:47 [igt-dev] [PATCH i-g-t] lib/igt_fb: better format printing Daniel Vetter
2019-03-11 17:03 ` Ville Syrjälä
2019-03-12 9:50 ` Patchwork [this message]
2019-03-12 13:51 ` Daniel Vetter
2019-03-12 13:53 ` Daniel Vetter
2019-03-13 16:27 ` Daniel Vetter
2019-03-13 11:22 ` [igt-dev] ✓ Fi.CI.BAT: success for lib/igt_fb: better format printing (rev3) Patchwork
2019-03-13 14:32 ` [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=20190312095031.22353.51207@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=daniel.vetter@ffwll.ch \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox