diff options
| author |   Alex Williamson <alex.williamson@redhat.com> | 2021-04-06 12:01:51 -0600 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2021-04-06 12:01:51 -0600 |
| commit | 6a2a235aa6275ffd8db3ef9e0e86cb638b1187d1 (patch) | |
| tree | ee1ba0b09809e4ff5de9321bf8e4086172385253 /drivers/vfio/pci/vfio_pci.c | |
| parent | vfio: Remove device_data from the vfio bus driver API (diff) | |
| parent | vfio/type1: Remove the almost unused check in vfio_iommu_type1_unpin_pages (diff) | |
| parent | vfio/pci: remove vfio_pci_nvlink2 (diff) | |
| download | linux-dev-6a2a235aa6275ffd8db3ef9e0e86cb638b1187d1.tar.xz linux-dev-6a2a235aa6275ffd8db3ef9e0e86cb638b1187d1.zip | |
Merge branches 'v5.13/vfio/embed-vfio_device', 'v5.13/vfio/misc' and 'v5.13/vfio/nvlink' into v5.13/vfio/next
Spelling fixes merged with file deletion.
Conflicts:
drivers/vfio/pci/vfio_pci_nvlink2.c
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>