Subject: [folded-merged] intel-iommu-integrate-dma-cma-fix.patch removed from -mm tree To: akinobu.mita@xxxxxxxxx,fengguang.wu@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 04 Jun 2014 15:23:11 -0700 The patch titled Subject: intel-iommu: add missing include of dma-contiguous.h has been removed from the -mm tree. Its filename was intel-iommu-integrate-dma-cma-fix.patch This patch was dropped because it was folded into intel-iommu-integrate-dma-cma.patch ------------------------------------------------------ From: Akinobu Mita <akinobu.mita@xxxxxxxxx> Subject: intel-iommu: add missing include of dma-contiguous.h This patch fixes build error on ia64, that is introduced by the patch intel-iommu-integrate-dma-cma.patch in -mm tree, and this change should be folded into it. Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx> Reported-by: Fengguang Wu <fengguang.wu@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/iommu/intel-iommu.c | 1 + 1 file changed, 1 insertion(+) diff -puN drivers/iommu/intel-iommu.c~intel-iommu-integrate-dma-cma-fix drivers/iommu/intel-iommu.c --- a/drivers/iommu/intel-iommu.c~intel-iommu-integrate-dma-cma-fix +++ a/drivers/iommu/intel-iommu.c @@ -39,6 +39,7 @@ #include <linux/dmi.h> #include <linux/pci-ats.h> #include <linux/memblock.h> +#include <linux/dma-contiguous.h> #include <asm/irq_remapping.h> #include <asm/cacheflush.h> #include <asm/iommu.h> _ Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are origin.patch x86-make-dma_alloc_coherent-return-zeroed-memory-if-cma-is-enabled.patch x86-enable-dma-cma-with-swiotlb.patch intel-iommu-integrate-dma-cma.patch memblock-introduce-memblock_alloc_range.patch cma-add-placement-specifier-for-cma=-kernel-parameter.patch arch-x86-kernel-pci-dmac-fix-dma_generic_alloc_coherent-when-config_dma_cma-is-enabled.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