projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e04ec1 a536019 b392a19)
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)
Spelling fixes merged with file deletion.

Conflicts:
drivers/vfio/pci/vfio_pci_nvlink2.c

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
1  2  3 
drivers/vfio/mdev/mdev_private.h patch | diff1 | diff2 | diff3 | blob | history
drivers/vfio/pci/vfio_pci.c patch | diff1 | diff2 | diff3 | blob | history
drivers/vfio/pci/vfio_pci_private.h patch | diff1 | diff2 | diff3 | blob | history

diff --cc drivers/vfio/mdev/mdev_private.h
Simple merge
diff --cc drivers/vfio/pci/vfio_pci.c
Simple merge
diff --cc drivers/vfio/pci/vfio_pci_private.h
Simple merge
Domain: System / Kernel;