Merge branch 'next' of git://github.com/awilliam/linux-vfio.git

diff --cc drivers/iommu/iommufd/device.c
Simple merge

diff --cc drivers/iommu/iommufd/iommufd_private.h
Simple merge

diff --cc drivers/iommu/iommufd/main.c
Simple merge