From: Alex Williamson <alex.williamson@redhat.com>
Date: Tue, 6 Apr 2021 18:01:51 +0000 (-0600)
Subject: Merge branches 'v5.13/vfio/embed-vfio_device', 'v5.13/vfio/misc' and 'v5.13/vfio... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6a2a235aa6275ffd8db3ef9e0e86cb638b1187d1;p=linux.git

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>
---

6a2a235aa6275ffd8db3ef9e0e86cb638b1187d1