Merge branches 'v5.13/vfio/embed-vfio_device', 'v5.13/vfio/misc' and 'v5.13/vfio...
authorAlex Williamson <alex.williamson@redhat.com>
Tue, 6 Apr 2021 18:01:51 +0000 (12:01 -0600)
committerAlex Williamson <alex.williamson@redhat.com>
Tue, 6 Apr 2021 18:01:51 +0000 (12:01 -0600)
commit6a2a235aa6275ffd8db3ef9e0e86cb638b1187d1
treeee1ba0b09809e4ff5de9321bf8e4086172385253
parent1e04ec14204dec28131855d8dd160c3d55d12797
parenta536019d3e7d85a901c5e6a2f2894c0aa0acaefa
parentb392a198917020cac996fd207355211ecfcfad84
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>
drivers/vfio/mdev/mdev_private.h
drivers/vfio/pci/vfio_pci.c
drivers/vfio/pci/vfio_pci_private.h