Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Merge commit. Changes below are compared with the first parent: 64ebe987.
Changes
45 files changed · +354 −198
Only the first 600 diff lines are shown. Download the complete patch.
Documentation/DMA-attributes.txt
View filearch/alpha/include/asm/dma-mapping.h
View filearch/alpha/kernel/pci-noop.c
View filearch/alpha/kernel/pci_iommu.c
View filearch/hexagon/include/asm/dma-mapping.h
View filearch/hexagon/kernel/dma.c
View filearch/ia64/hp/common/sba_iommu.c
View filearch/ia64/include/asm/dma-mapping.h
View filearch/ia64/kernel/pci-swiotlb.c
View filearch/ia64/sn/pci/pci_dma.c
View filearch/microblaze/include/asm/dma-mapping.h
View filearch/microblaze/kernel/dma.c
View filearch/mips/cavium-octeon/dma-octeon.c
View filearch/mips/include/asm/dma-mapping.h
View filearch/mips/mm/dma-default.c
View filearch/powerpc/include/asm/dma-mapping.h
View fileThis diff is incomplete. Download the complete patch.
arch/powerpc/kernel/dma-iommu.c
View fileThis diff is incomplete. Download the complete patch.
arch/powerpc/kernel/dma-swiotlb.c
View fileThis diff is incomplete. Download the complete patch.
arch/powerpc/kernel/dma.c
View fileThis diff is incomplete. Download the complete patch.
arch/powerpc/kernel/ibmebus.c
View fileThis diff is incomplete. Download the complete patch.
arch/powerpc/kernel/vio.c
View fileThis diff is incomplete. Download the complete patch.
arch/powerpc/platforms/cell/iommu.c
View fileThis diff is incomplete. Download the complete patch.
arch/powerpc/platforms/ps3/system-bus.c
View fileThis diff is incomplete. Download the complete patch.
arch/sh/include/asm/dma-mapping.h
View fileThis diff is incomplete. Download the complete patch.
arch/sh/kernel/dma-nommu.c
View fileThis diff is incomplete. Download the complete patch.
arch/sh/mm/consistent.c
View fileThis diff is incomplete. Download the complete patch.
arch/sparc/include/asm/dma-mapping.h
View fileThis diff is incomplete. Download the complete patch.
arch/sparc/kernel/iommu.c
View fileThis diff is incomplete. Download the complete patch.
arch/sparc/kernel/ioport.c
View fileThis diff is incomplete. Download the complete patch.
arch/sparc/kernel/pci_sun4v.c
View fileThis diff is incomplete. Download the complete patch.
arch/unicore32/include/asm/dma-mapping.h
View fileThis diff is incomplete. Download the complete patch.
arch/unicore32/mm/dma-swiotlb.c
View fileThis diff is incomplete. Download the complete patch.
arch/x86/include/asm/dma-mapping.h
View fileThis diff is incomplete. Download the complete patch.
arch/x86/kernel/amd_gart_64.c
View fileThis diff is incomplete. Download the complete patch.
arch/x86/kernel/pci-calgary_64.c
View fileThis diff is incomplete. Download the complete patch.
arch/x86/kernel/pci-dma.c
View fileThis diff is incomplete. Download the complete patch.
arch/x86/kernel/pci-nommu.c
View fileThis diff is incomplete. Download the complete patch.
arch/x86/kernel/pci-swiotlb.c
View fileThis diff is incomplete. Download the complete patch.
arch/x86/xen/pci-swiotlb-xen.c
View fileThis diff is incomplete. Download the complete patch.
drivers/iommu/amd_iommu.c
View fileThis diff is incomplete. Download the complete patch.
drivers/iommu/intel-iommu.c
View fileThis diff is incomplete. Download the complete patch.
drivers/xen/swiotlb-xen.c
View fileThis diff is incomplete. Download the complete patch.
include/linux/dma-attrs.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/dma-mapping.h
View fileThis diff is incomplete. Download the complete patch.
include/xen/swiotlb-xen.h
View fileThis diff is incomplete. Download the complete patch.