]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit81bfbc45babe623a1e8f598cbebc7e519bd012c1
treeee1ba0b09809e4ff5de9321bf8e4086172385253
parent5fe9926c94759176173df7fbb54ce4fbec9e5d27
parentc65eb5ddc938d2312ecfe1054562f1a3c2c720b9
parentbd9416e017adefa44a878319f72fc1d401aaa2d0
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