== 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
