From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Dmitry Osipenko" <dmitry.osipenko@collabora.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for Move all drivers to a common dma-buf locking convention
Date: Wed, 14 Sep 2022 00:06:08 -0000 [thread overview]
Message-ID: <166311396895.30164.3261539520068097526@emeril.freedesktop.org> (raw)
In-Reply-To: <20220913192757.37727-1-dmitry.osipenko@collabora.com>
== Series Details ==
Series: Move all drivers to a common dma-buf locking convention
URL : https://patchwork.freedesktop.org/series/108517/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/108517/revisions/1/mbox/ not applied
Applying: dma-buf: Add unlocked variant of vmapping functions
Applying: dma-buf: Add unlocked variant of attachment-mapping functions
Applying: drm/gem: Take reservation lock for vmap/vunmap operations
Using index info to reconstruct a base tree...
M drivers/gpu/drm/drm_gem.c
M include/drm/drm_gem.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/drm_gem.h
CONFLICT (content): Merge conflict in include/drm/drm_gem.h
Auto-merging drivers/gpu/drm/drm_gem.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 drm/gem: Take reservation lock for vmap/vunmap operations
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".
next prev parent reply other threads:[~2022-09-14 0:06 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-13 19:27 [Intel-gfx] [PATCH v5 00/21] Move all drivers to a common dma-buf locking convention Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 01/21] dma-buf: Add unlocked variant of vmapping functions Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 02/21] dma-buf: Add unlocked variant of attachment-mapping functions Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 03/21] drm/gem: Take reservation lock for vmap/vunmap operations Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 04/21] drm/prime: Prepare to dynamic dma-buf locking specification Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 05/21] drm/armada: " Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 06/21] drm/i915: " Dmitry Osipenko
2022-09-15 13:19 ` Ruhl, Michael J
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 07/21] drm/omapdrm: " Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 08/21] drm/tegra: " Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 09/21] drm/etnaviv: " Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 10/21] RDMA/umem: " Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 11/21] misc: fastrpc: " Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 12/21] xen/gntdev: " Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 13/21] media: videobuf2: " Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 14/21] media: tegra-vde: " Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 15/21] dma-buf: Move dma_buf_vmap() to dynamic " Dmitry Osipenko
2022-09-20 14:13 ` Sumit Semwal
2022-09-21 10:29 ` Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 16/21] dma-buf: Move dma_buf_attach() " Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 17/21] dma-buf: Move dma_buf_map_attachment() " Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 18/21] dma-buf: Move dma_buf_mmap() " Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 19/21] dma-buf: Document dynamic locking convention Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 20/21] media: videobuf2: Stop using internal dma-buf lock Dmitry Osipenko
2022-09-13 19:27 ` [Intel-gfx] [PATCH v5 21/21] dma-buf: Remove obsoleted internal lock Dmitry Osipenko
2022-09-14 0:06 ` Patchwork [this message]
2022-09-20 14:16 ` [Intel-gfx] [PATCH v5 00/21] Move all drivers to a common dma-buf locking convention Sumit Semwal
-- strict thread matches above, loose matches on Subject: below --
2022-07-25 15:18 [Intel-gfx] [PATCH v2 0/5] " Dmitry Osipenko
2022-08-04 15:45 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
2022-07-15 0:52 [Intel-gfx] [PATCH v1 0/6] " Dmitry Osipenko
2022-07-20 15:01 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " 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=166311396895.30164.3261539520068097526@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=dmitry.osipenko@collabora.com \
--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