Merge branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into next
Conflicts: drivers/iommu/amd_iommu_types.h
Showing
- Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt 19 additions, 0 deletionsDocumentation/devicetree/bindings/iommu/arm,smmu-v3.txt
- Documentation/devicetree/bindings/iommu/ti,omap-iommu.txt 27 additions, 0 deletionsDocumentation/devicetree/bindings/iommu/ti,omap-iommu.txt
- MAINTAINERS 7 additions, 0 deletionsMAINTAINERS
- arch/arm64/Kconfig 1 addition, 0 deletionsarch/arm64/Kconfig
- arch/arm64/include/asm/dma-mapping.h 7 additions, 8 deletionsarch/arm64/include/asm/dma-mapping.h
- arch/arm64/mm/dma-mapping.c 457 additions, 0 deletionsarch/arm64/mm/dma-mapping.c
- arch/s390/Kconfig 1 addition, 0 deletionsarch/s390/Kconfig
- arch/s390/include/asm/pci.h 4 additions, 0 deletionsarch/s390/include/asm/pci.h
- arch/s390/include/asm/pci_dma.h 4 additions, 1 deletionarch/s390/include/asm/pci_dma.h
- arch/s390/pci/pci_dma.c 25 additions, 12 deletionsarch/s390/pci/pci_dma.c
- drivers/iommu/Kconfig 15 additions, 0 deletionsdrivers/iommu/Kconfig
- drivers/iommu/Makefile 2 additions, 0 deletionsdrivers/iommu/Makefile
- drivers/iommu/amd_iommu.c 39 additions, 134 deletionsdrivers/iommu/amd_iommu.c
- drivers/iommu/amd_iommu_init.c 27 additions, 93 deletionsdrivers/iommu/amd_iommu_init.c
- drivers/iommu/amd_iommu_types.h 2 additions, 11 deletionsdrivers/iommu/amd_iommu_types.h
- drivers/iommu/arm-smmu-v3.c 111 additions, 44 deletionsdrivers/iommu/arm-smmu-v3.c
- drivers/iommu/arm-smmu.c 75 additions, 57 deletionsdrivers/iommu/arm-smmu.c
- drivers/iommu/dma-iommu.c 524 additions, 0 deletionsdrivers/iommu/dma-iommu.c
- drivers/iommu/fsl_pamu_domain.c 16 additions, 25 deletionsdrivers/iommu/fsl_pamu_domain.c
- drivers/iommu/intel-iommu.c 54 additions, 29 deletionsdrivers/iommu/intel-iommu.c
Loading
Please register or sign in to comment