Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git

# Conflicts:
#	include/linux/vfio_pci_core.h