From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Will Deacon" <will@kernel.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for Restricted DMA (rev5)
Date: Tue, 01 Jun 2021 19:42:27 -0000 [thread overview]
Message-ID: <162257654745.19249.2909555042230463066@emeril.freedesktop.org> (raw)
In-Reply-To: <20210518064215.2856977-1-tientzu@chromium.org>
== Series Details ==
Series: Restricted DMA (rev5)
URL : https://patchwork.freedesktop.org/series/89341/
State : failure
== Summary ==
Applying: swiotlb: Refactor swiotlb init functions
Applying: swiotlb: Refactor swiotlb_create_debugfs
Applying: swiotlb: Add DMA_RESTRICTED_POOL
Applying: swiotlb: Add restricted DMA pool initialization
Using index info to reconstruct a base tree...
M drivers/base/core.c
M include/linux/device.h
M include/linux/swiotlb.h
M kernel/dma/swiotlb.c
Falling back to patching base and 3-way merge...
Auto-merging kernel/dma/swiotlb.c
CONFLICT (content): Merge conflict in kernel/dma/swiotlb.c
Auto-merging include/linux/swiotlb.h
CONFLICT (content): Merge conflict in include/linux/swiotlb.h
Auto-merging include/linux/device.h
CONFLICT (content): Merge conflict in include/linux/device.h
Auto-merging drivers/base/core.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 swiotlb: Add restricted DMA pool initialization
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:[~2021-06-01 19:42 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-18 6:42 [Intel-gfx] [PATCH v7 00/15] Restricted DMA Claire Chang
2021-05-18 6:42 ` [Intel-gfx] [PATCH v7 01/15] swiotlb: Refactor swiotlb init functions Claire Chang
2021-05-19 18:50 ` Florian Fainelli
2021-05-20 6:40 ` Claire Chang
2021-05-24 15:53 ` Konrad Rzeszutek Wilk
2021-05-25 3:08 ` Claire Chang
2021-05-27 13:02 ` Christoph Hellwig
2021-05-27 14:41 ` Tom Lendacky
2021-05-27 16:32 ` Tom Lendacky
2021-05-31 15:00 ` Claire Chang
2021-05-18 6:42 ` [Intel-gfx] [PATCH v7 02/15] swiotlb: Refactor swiotlb_create_debugfs Claire Chang
2021-05-19 19:24 ` Florian Fainelli
2021-05-27 13:24 ` Christoph Hellwig
2021-05-18 6:42 ` [Intel-gfx] [PATCH v7 03/15] swiotlb: Add DMA_RESTRICTED_POOL Claire Chang
2021-05-19 19:00 ` Florian Fainelli
2021-05-27 13:25 ` Christoph Hellwig
2021-05-18 6:42 ` [Intel-gfx] [PATCH v7 04/15] swiotlb: Add restricted DMA pool initialization Claire Chang
2021-05-18 6:48 ` Claire Chang
2021-05-24 15:49 ` Konrad Rzeszutek Wilk
2021-05-25 3:08 ` Claire Chang
2021-05-27 13:27 ` Christoph Hellwig
2021-05-19 18:54 ` Florian Fainelli
2021-05-20 6:39 ` Claire Chang
2021-05-27 13:27 ` Christoph Hellwig
2021-05-18 6:42 ` [Intel-gfx] [PATCH v7 05/15] swiotlb: Add a new get_io_tlb_mem getter Claire Chang
2021-05-18 6:51 ` Claire Chang
2021-05-24 15:51 ` Konrad Rzeszutek Wilk
2021-05-25 3:08 ` Claire Chang
2021-05-19 19:18 ` Florian Fainelli
2021-05-18 6:42 ` [Intel-gfx] [PATCH v7 06/15] swiotlb: Update is_swiotlb_buffer to add a struct device argument Claire Chang
2021-05-19 19:19 ` Florian Fainelli
2021-05-18 6:42 ` [Intel-gfx] [PATCH v7 07/15] swiotlb: Update is_swiotlb_active " Claire Chang
2021-05-19 19:20 ` Florian Fainelli
2021-05-27 13:28 ` Christoph Hellwig
2021-05-18 6:42 ` [Intel-gfx] [PATCH v7 08/15] swiotlb: Bounce data from/to restricted DMA pool if available Claire Chang
2021-05-18 6:42 ` [Intel-gfx] [PATCH v7 09/15] swiotlb: Move alloc_size to find_slots Claire Chang
2021-05-18 6:42 ` [Intel-gfx] [PATCH v7 10/15] swiotlb: Refactor swiotlb_tbl_unmap_single Claire Chang
2021-05-18 6:42 ` [Intel-gfx] [PATCH v7 11/15] dma-direct: Add a new wrapper __dma_direct_free_pages() Claire Chang
2021-05-19 18:59 ` Florian Fainelli
2021-05-18 6:42 ` [Intel-gfx] [PATCH v7 12/15] swiotlb: Add restricted DMA alloc/free support Claire Chang
2021-05-18 6:42 ` [Intel-gfx] [PATCH v7 13/15] dma-direct: Allocate memory from restricted DMA pool if available Claire Chang
2021-05-27 13:30 ` Christoph Hellwig
2021-05-18 6:42 ` [Intel-gfx] [PATCH v7 14/15] dt-bindings: of: Add restricted DMA pool Claire Chang
2021-05-26 12:13 ` Will Deacon
2021-05-26 15:53 ` Will Deacon
2021-05-27 11:29 ` Claire Chang
2021-05-27 11:34 ` Will Deacon
2021-05-27 12:48 ` Claire Chang
2021-05-27 12:53 ` Will Deacon
2021-05-18 6:42 ` [Intel-gfx] [PATCH v7 15/15] of: Add plumbing for " Claire Chang
2021-05-18 6:53 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Restricted DMA (rev3) Patchwork
2021-05-18 6:56 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-05-18 7:29 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-05-18 9:10 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-05-27 13:00 ` [Intel-gfx] [PATCH v7 00/15] Restricted DMA Claire Chang
2021-05-27 13:54 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Restricted DMA (rev4) Patchwork
2021-06-01 19:42 ` Patchwork [this message]
2021-06-24 15:55 [Intel-gfx] [PATCH v15 00/12] Restricted DMA Claire Chang
2021-07-06 18:57 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Restricted DMA (rev5) 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=162257654745.19249.2909555042230463066@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=will@kernel.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;
as well as URLs for NNTP newsgroup(s).