Jason Gunthorpe 90337f526c Merge tag 'v6.1-rc7' into iommufd.git for-next ...

Resolve conflicts in drivers/vfio/vfio_main.c by using the iommfd version.
The rc fix was done a different way when iommufd patches reworked this
code.

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

2022-12-02 12:04:39 -04:00

..

fsl-mc

vfio-iommufd: Support iommufd for physical VFIO devices

2022-12-02 11:52:03 -04:00

mdev

vfio/mdev: add mdev available instance checking to the core

2022-10-04 12:06:58 -06:00

pci

Merge tag 'v6.1-rc7' into iommufd.git for-next

2022-12-02 12:04:39 -04:00

platform

vfio-iommufd: Support iommufd for physical VFIO devices

2022-12-02 11:52:03 -04:00

container.c

vfio: Move container related MODULE_ALIAS statements into container.c

2022-12-02 11:52:04 -04:00

iommufd.c

vfio-iommufd: Support iommufd for emulated VFIO devices

2022-12-02 11:52:03 -04:00

iova_bitmap.c

vfio: Add an IOVA bitmap support

2022-09-08 12:59:00 -06:00

Kconfig

vfio: Make vfio_container optionally compiled

2022-12-02 11:52:04 -04:00

Makefile

vfio: Make vfio_container optionally compiled

2022-12-02 11:52:04 -04:00

vfio_iommu_spapr_tce.c

vfio/spapr_tce: Fix the comment

2022-07-22 16:24:47 -06:00

vfio_iommu_type1.c

Merge branches 'apple/dart', 'arm/mediatek', 'arm/omap', 'arm/smmu', 'virtio', 'x86/vt-d', 'x86/amd' and 'core' into next

2022-09-26 15:52:31 +02:00

vfio_main.c

Merge tag 'v6.1-rc7' into iommufd.git for-next

2022-12-02 12:04:39 -04:00

vfio_spapr_eeh.c

…

vfio.h

vfio: Make vfio_container optionally compiled

2022-12-02 11:52:04 -04:00

virqfd.c

vfio/virqfd: Drain events from eventfd in virqfd_wakeup()

2020-11-15 09:49:10 -05:00