From: Patchwork <patchwork@emeril.freedesktop.org>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Ro.CI.BAT: failure for Documentation: convert DocBook gpu.tmpl to reStructuredText
Date: Mon, 20 Jun 2016 15:21:51 -0000 [thread overview]
Message-ID: <20160620152151.16091.58825@emeril.freedesktop.org> (raw)
In-Reply-To: <cover.1466434348.git.jani.nikula@intel.com>
== Series Details ==
Series: Documentation: convert DocBook gpu.tmpl to reStructuredText
URL : https://patchwork.freedesktop.org/series/8931/
State : failure
== Summary ==
Applying: Documentation/gpu: add new gpu.rst converted from DocBook gpu.tmpl
Using index info to reconstruct a base tree...
M Documentation/index.rst
Falling back to patching base and 3-way merge...
Auto-merging Documentation/index.rst
CONFLICT (content): Merge conflict in Documentation/index.rst
error: Failed to merge in the changes.
Patch failed at 0001 Documentation/gpu: add new gpu.rst converted from DocBook gpu.tmpl
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:[~2016-06-20 15:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-20 15:07 [PATCH 0/6] Documentation: convert DocBook gpu.tmpl to reStructuredText Jani Nikula
2016-06-20 15:07 ` [PATCH 1/6] Documentation/gpu: add new gpu.rst converted from DocBook gpu.tmpl Jani Nikula
2016-06-20 15:07 ` [PATCH 2/6] Documentation/gpu: split up the gpu documentation Jani Nikula
2016-06-20 15:07 ` [PATCH 3/6] MAINTAINERS: add Documentation/gpu and Documentation/gpu/i915.rst Jani Nikula
2016-06-20 15:07 ` [PATCH 4/6] Documentation/gpu: use recommended order of heading markers Jani Nikula
2016-06-20 15:07 ` [PATCH 5/6] Documentation/gpu: convert the KMS properties table to CSV Jani Nikula
2016-06-20 15:07 ` [PATCH 6/6] Documentation/DocBook: remove gpu.tmpl Jani Nikula
2016-06-20 15:21 ` 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=20160620152151.16091.58825@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@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