]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff806cb 0286300)
Merge remote-tracking branch 'iommu/vfio-notifier-fix' into v5.19/vfio/next
authorAlex Williamson <alex.williamson@redhat.com>
Fri, 13 May 2022 16:04:22 +0000 (10:04 -0600)
committerAlex Williamson <alex.williamson@redhat.com>
Fri, 13 May 2022 16:04:22 +0000 (10:04 -0600)
Merge IOMMU dependencies for vfio.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
1  2 
drivers/iommu/iommu.c patch | diff1 | diff2 | blob | history
drivers/vfio/pci/vfio_pci.c patch | diff1 | diff2 | blob | history
drivers/vfio/vfio.c patch | diff1 | diff2 | blob | history

diff --cc drivers/iommu/iommu.c
Simple merge
diff --cc drivers/vfio/pci/vfio_pci.c
Simple merge
diff --cc drivers/vfio/vfio.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.