From: Patchwork <patchwork@emeril.freedesktop.org>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for series starting with [v5] dma-fence: Propagate errors to dma-fence-array container (rev6)
Date: Sun, 11 Aug 2019 16:38:42 -0000 [thread overview]
Message-ID: <20190811163842.32131.8237@emeril.freedesktop.org> (raw)
In-Reply-To: <20190810153430.30636-1-chris@chris-wilson.co.uk>
== Series Details ==
Series: series starting with [v5] dma-fence: Propagate errors to dma-fence-array container (rev6)
URL : https://patchwork.freedesktop.org/series/65027/
State : failure
== Summary ==
Applying: dma-fence: Propagate errors to dma-fence-array container
Applying: dma-fence: Report the composite sync_file status
Applying: dma-fence: Refactor signaling for manual invocation
Applying: dma-fence: Have dma_fence_signal call signal_locked
Using index info to reconstruct a base tree...
M drivers/dma-buf/dma-fence.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/dma-buf/dma-fence.c
CONFLICT (content): Merge conflict in drivers/dma-buf/dma-fence.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0004 dma-fence: Have dma_fence_signal call signal_locked
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
next prev parent reply other threads:[~2019-08-11 16:38 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-10 15:34 [PATCH 1/4] dma-fence: Propagate errors to dma-fence-array container Chris Wilson
2019-08-10 15:34 ` [PATCH 2/4] dma-fence: Report the composite sync_file status Chris Wilson
2019-08-12 9:05 ` [Intel-gfx] " Matthew Auld
2019-08-10 15:34 ` [PATCH 3/4] dma-fence: Refactor signaling for manual invocation Chris Wilson
2019-08-12 14:34 ` Koenig, Christian
2019-08-12 14:43 ` Chris Wilson
2019-08-12 14:50 ` Koenig, Christian
2019-08-12 14:53 ` Chris Wilson
2019-08-13 6:59 ` Koenig, Christian
2019-08-13 8:25 ` Chris Wilson
2019-08-13 8:49 ` Koenig, Christian
2019-08-10 15:34 ` [PATCH 4/4] dma-fence: Always execute signal callbacks Chris Wilson
2019-08-11 9:01 ` Koenig, Christian
2019-08-11 9:15 ` [PATCH 5/4] dma-fence: Have dma_fence_signal call signal_locked Chris Wilson
2019-08-11 16:09 ` Koenig, Christian
2019-08-14 17:20 ` Daniel Vetter
2019-08-15 18:45 ` Chris Wilson
2019-08-15 18:48 ` Daniel Vetter
2019-08-15 19:03 ` Chris Wilson
2019-08-15 19:29 ` Chris Wilson
2019-08-16 7:58 ` Koenig, Christian
2019-08-10 15:56 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/4] dma-fence: Propagate errors to dma-fence-array container Patchwork
2019-08-10 16:20 ` ✓ Fi.CI.BAT: success " Patchwork
2019-08-11 8:34 ` ✓ Fi.CI.IGT: " Patchwork
2019-08-11 8:58 ` [PATCH 1/4] " Koenig, Christian
2019-08-11 11:56 ` Chris Wilson
2019-08-11 9:21 ` ✗ Fi.CI.BAT: failure for series starting with [1/4] dma-fence: Propagate errors to dma-fence-array container (rev2) Patchwork
2019-08-11 12:02 ` ✗ Fi.CI.BAT: failure for series starting with [1/4] dma-fence: Propagate errors to dma-fence-array container (rev3) Patchwork
2019-08-11 12:09 ` [PATCH v3] dma-fence: Propagate errors to dma-fence-array container Chris Wilson
2019-08-11 12:20 ` ✗ Fi.CI.BAT: failure for series starting with [v3] dma-fence: Propagate errors to dma-fence-array container (rev4) Patchwork
2019-08-11 12:21 ` [PATCH v4] dma-fence: Propagate errors to dma-fence-array container Chris Wilson
2019-08-11 16:08 ` Koenig, Christian
2019-08-11 16:25 ` [PATCH v5] " Chris Wilson
2019-08-11 16:28 ` Koenig, Christian
2019-08-11 19:33 ` [PATCH v4] " kbuild test robot
2019-08-11 13:08 ` ✗ Fi.CI.BAT: failure for series starting with [v4] dma-fence: Propagate errors to dma-fence-array container (rev5) Patchwork
2019-08-11 16:38 ` Patchwork [this message]
2019-08-15 19:22 ` ✗ Fi.CI.BAT: failure for series starting with [v5] dma-fence: Propagate errors to dma-fence-array container (rev7) 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=20190811163842.32131.8237@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@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