Merge branches 'v5.8/vfio/alex-block-mmio-v3', 'v5.8/vfio/alex-zero-cap-v2' and ...
authorAlex Williamson <alex.williamson@redhat.com>
Tue, 26 May 2020 16:27:15 +0000 (10:27 -0600)
committerAlex Williamson <alex.williamson@redhat.com>
Tue, 26 May 2020 16:27:15 +0000 (10:27 -0600)
commitcd34b82e6ef09aaf789eb9c040e3d0f92d28c969
treea8dc944febcb92a06bb863d974800b77a9055551
parent9cb1fd0efd195590b828b9b865421ad345a4a145
parentabafbc551fddede3e0a08dee1dcde08fc0eb8476
parentbc138db1b96264b9c1779cf18d5a3b186aa90066
parent1518ac272e789cae8c555d69951b032a275b7602
Merge branches 'v5.8/vfio/alex-block-mmio-v3', 'v5.8/vfio/alex-zero-cap-v2' and 'v5.8/vfio/qian-leak-fixes' into v5.8/vfio/next
drivers/vfio/pci/vfio_pci.c
drivers/vfio/pci/vfio_pci_config.c