The patch titled Subject: dma-mapping-cosolidate-dma_mapping_error-fix has been removed from the -mm tree. Its filename was dma-mapping-cosolidate-dma_mapping_error-fix.patch This patch was dropped because it was folded into dma-mapping-cosolidate-dma_mapping_error.patch ------------------------------------------------------ From: Max Filippov <jcmvbkbc@xxxxxxxxx> Subject: dma-mapping-cosolidate-dma_mapping_error-fix fix xtensa Signed-off-by: Max Filippov <jcmvbkbc@xxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/xtensa/include/asm/dma-mapping.h | 9 --------- 1 file changed, 9 deletions(-) diff -puN arch/xtensa/include/asm/dma-mapping.h~dma-mapping-cosolidate-dma_mapping_error-fix arch/xtensa/include/asm/dma-mapping.h --- a/arch/xtensa/include/asm/dma-mapping.h~dma-mapping-cosolidate-dma_mapping_error-fix +++ a/arch/xtensa/include/asm/dma-mapping.h @@ -33,15 +33,6 @@ static inline struct dma_map_ops *get_dm #include <asm-generic/dma-mapping-common.h> static inline int -dma_mapping_error(struct device *dev, dma_addr_t dma_addr) -{ - struct dma_map_ops *ops = get_dma_ops(dev); - - debug_dma_mapping_error(dev, dma_addr); - return ops->mapping_error(dev, dma_addr); -} - -static inline int dma_supported(struct device *dev, u64 mask) { return 1; _ Patches currently in -mm which might be from jcmvbkbc@xxxxxxxxx are dma-mapping-cosolidate-dma_mapping_error.patch dma-mapping-consolidate-dma_supported-fix.patch dma-mapping-consolidate-dma_set_mask-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html