Merge branch 'x86-dma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Merge commit. Changes below are compared with the first parent: ce6eba3d.
Changes
30 files changed · +182 −558
Only the first 600 diff lines are shown. Download the complete patch.
arch/arm/include/asm/dma-direct.h
View filearch/mips/cavium-octeon/dma-octeon.c
View filearch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
View filearch/mips/include/asm/mach-loongson64/dma-coherence.h
View filearch/mips/loongson64/common/dma-swiotlb.c
View filearch/powerpc/include/asm/dma-direct.h
View filearch/x86/Kconfig
View filearch/x86/include/asm/device.h
View filearch/x86/include/asm/dma-direct.h
View filearch/x86/include/asm/dma-mapping.h
View filearch/x86/include/asm/iommu.h
View filearch/x86/include/asm/mem_encrypt.h
View filearch/x86/include/asm/swiotlb.h
View filearch/x86/kernel/Makefile
View filearch/x86/kernel/amd_gart_64.c
View filearch/x86/kernel/pci-calgary_64.c
View filearch/x86/kernel/pci-dma.c
View filearch/x86/kernel/pci-swiotlb.c
View fileThis diff is incomplete. Download the complete patch.
arch/x86/mm/mem_encrypt.c
View fileThis diff is incomplete. Download the complete patch.
arch/x86/pci/sta2x11-fixup.c
View fileThis diff is incomplete. Download the complete patch.
drivers/iommu/Kconfig
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-direct.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/linux/set_memory.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/swiotlb.h
View fileThis diff is incomplete. Download the complete patch.
lib/dma-direct.c
View fileThis diff is incomplete. Download the complete patch.
lib/swiotlb.c
View fileThis diff is incomplete. Download the complete patch.