summaryrefslogtreecommitdiff
path: root/drivers/vfio
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@redhat.com>2022-06-30 11:50:40 -0600
committerAlex Williamson <alex.williamson@redhat.com>2022-06-30 11:50:40 -0600
commit7654a8881a54c335f176c7dc0a923480228497de (patch)
tree1d79d4e5fffe1ef190d9242c4850946bcf563b69 /drivers/vfio
parent6e97eba8ad8748fabb795cffc5d9e1a7dcfd7367 (diff)
parent3b498b6656214d499d57f1e4935448821d0febf9 (diff)
parenta13b1e472b93f69c35976351e59831564ed6a376 (diff)
parent1c61d51e9695d00535d28fc2e123ba9397378707 (diff)
parent6641085e8d7b3f061911517f79a2a15a0a21b97b (diff)
parentffed0518d871482e26c5826c0875bea6775446da (diff)
parent330c179976f3801526bf222b010b669bf6743098 (diff)
Merge branches 'v5.20/vfio/migration-enhancements-v3', 'v5.20/vfio/simplify-bus_type-determination-v3', 'v5.20/vfio/check-vfio_register_iommu_driver-return-v2', 'v5.20/vfio/check-iommu_group_set_name_return-v1', 'v5.20/vfio/clear-caps-buf-v3', 'v5.20/vfio/remove-useless-judgement-v1' and 'v5.20/vfio/move-device_open-count-v2' into v5.20/vfio/next