Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git
# Conflicts: # drivers/iommu/dma-iommu.c
Showing
- Documentation/userspace-api/iommufd.rst 17 additions, 0 deletionsDocumentation/userspace-api/iommufd.rst
- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c 60 additions, 0 deletionsdrivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c
- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c 52 additions, 28 deletionsdrivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h 36 additions, 0 deletionsdrivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
- drivers/iommu/dma-iommu.c 104 additions, 100 deletionsdrivers/iommu/dma-iommu.c
- drivers/iommu/dma-iommu.h 14 additions, 0 deletionsdrivers/iommu/dma-iommu.h
- drivers/iommu/intel/iommu.c 2 additions, 1 deletiondrivers/iommu/intel/iommu.c
- drivers/iommu/intel/nested.c 1 addition, 1 deletiondrivers/iommu/intel/nested.c
- drivers/iommu/iommu-priv.h 16 additions, 0 deletionsdrivers/iommu/iommu-priv.h
- drivers/iommu/iommu-sva.c 1 addition, 0 deletionsdrivers/iommu/iommu-sva.c
- drivers/iommu/iommu.c 150 additions, 9 deletionsdrivers/iommu/iommu.c
- drivers/iommu/iommufd/Makefile 1 addition, 1 deletiondrivers/iommu/iommufd/Makefile
- drivers/iommu/iommufd/device.c 288 additions, 206 deletionsdrivers/iommu/iommufd/device.c
- drivers/iommu/iommufd/driver.c 197 additions, 0 deletionsdrivers/iommu/iommufd/driver.c
- drivers/iommu/iommufd/eventq.c 597 additions, 0 deletionsdrivers/iommu/iommufd/eventq.c
- drivers/iommu/iommufd/hw_pagetable.c 26 additions, 16 deletionsdrivers/iommu/iommufd/hw_pagetable.c
- drivers/iommu/iommufd/iommufd_private.h 114 additions, 42 deletionsdrivers/iommu/iommufd/iommufd_private.h
- drivers/iommu/iommufd/iommufd_test.h 40 additions, 0 deletionsdrivers/iommu/iommufd/iommufd_test.h
- drivers/iommu/iommufd/main.c 7 additions, 0 deletionsdrivers/iommu/iommufd/main.c
- drivers/iommu/iommufd/selftest.c 275 additions, 22 deletionsdrivers/iommu/iommufd/selftest.c
Loading
Please register or sign in to comment