summaryrefslogtreecommitdiffstats
path: root/drivers/vfio
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@redhat.com>2019-08-23 11:26:24 -0600
committerAlex Williamson <alex.williamson@redhat.com>2019-08-23 11:26:24 -0600
commite6c5d727db0a86a3ff21aca6824aae87f3bc055f (patch)
treeed04d882d7a1d1d219fc250accc5ad10aabb5abd /drivers/vfio
parente3fb13b7e47cd18b2bd067ea8a491020b4644baf (diff)
parent78becab98b8f2f7d22e615675d1a701a67a885af (diff)
parentdb2cb969e8aed2395620fe2cb0bffd194c02b4b1 (diff)
parent92c8026854c25093946e0d7fe536fd9eac440f06 (diff)
parenteee413e620f408e1e88d94b16d05f45407939d1b (diff)
parentb09d6e47397409faf12f72edd140956e4cfe3011 (diff)
downloadlinux-e6c5d727db0a86a3ff21aca6824aae87f3bc055f.tar.gz
linux-e6c5d727db0a86a3ff21aca6824aae87f3bc055f.tar.bz2
linux-e6c5d727db0a86a3ff21aca6824aae87f3bc055f.zip
Merge branches 'v5.4/vfio/alexey-tce-memory-free-v1', 'v5.4/vfio/connie-re-arrange-v2', 'v5.4/vfio/hexin-pci-reset-v3', 'v5.4/vfio/parav-mtty-uuid-v2' and 'v5.4/vfio/shameer-iova-list-v8' into v5.4/vfio/next