From: Patchwork <patchwork@emeril.freedesktop.org>
To: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for series starting with [1/2] i915: convert to new mount API (rev2)
Date: Fri, 02 Aug 2019 14:22:45 -0000 [thread overview]
Message-ID: <20190802142245.15548.49804@emeril.freedesktop.org> (raw)
In-Reply-To: <20190802123956.2450-1-sergey.senozhatsky@gmail.com>
== Series Details ==
Series: series starting with [1/2] i915: convert to new mount API (rev2)
URL : https://patchwork.freedesktop.org/series/64607/
State : failure
== Summary ==
Applying: i915: convert to new mount API
Applying: i915: do not leak module ref counter
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gem/i915_gemfs.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gem/i915_gemfs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gemfs.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 i915: do not leak module ref counter
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:[~2019-08-02 14:22 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-02 12:39 [PATCH 1/2] i915: convert to new mount API Sergey Senozhatsky
2019-08-02 12:39 ` [PATCH 2/2] i915: do not leak module ref counter Sergey Senozhatsky
2019-08-02 12:58 ` Chris Wilson
2019-08-02 13:10 ` Chris Wilson
2019-08-02 13:15 ` Sergey Senozhatsky
2019-08-02 13:35 ` Sergey Senozhatsky
2019-08-02 13:41 ` Chris Wilson
2019-08-02 13:49 ` Sergey Senozhatsky
2019-08-02 13:59 ` Chris Wilson
2019-08-02 12:54 ` [PATCH 1/2] i915: convert to new mount API Chris Wilson
2019-08-02 13:10 ` Sergey Senozhatsky
2019-08-02 12:58 ` ✗ Fi.CI.BAT: failure for series starting with [1/2] " Patchwork
2019-08-02 14:22 ` 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=20190802142245.15548.49804@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=sergey.senozhatsky@gmail.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