diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-28 00:17:21 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-28 00:17:21 +0200 |
| commit | c322f5399fc36300ae870db8fbcf793e063aaae5 (patch) | |
| tree | 6dcb4270971b933db314e5805d37626fd3e47af6 /include | |
| parent | Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | vfio/pci: Fix SR-IOV VF handling with MMIO blocking (diff) | |
| download | linux-c322f5399fc36300ae870db8fbcf793e063aaae5.tar.xz linux-c322f5399fc36300ae870db8fbcf793e063aaae5.zip | |
Merge tag 'vfio-v5.8-rc3' of git://github.com/awilliam/linux-vfio
Pull VFIO fixes from Alex Williamson:
- Fix double free of eventfd ctx (Alex Williamson)
- Fix duplicate use of capability ID (Alex Williamson)
- Fix SR-IOV VF memory enable handling (Alex Williamson)
* tag 'vfio-v5.8-rc3' of git://github.com/awilliam/linux-vfio:
vfio/pci: Fix SR-IOV VF handling with MMIO blocking
vfio/type1: Fix migration info capability ID
vfio/pci: Clear error and request eventfd ctx after releasing
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/vfio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index eca6692667a3..920470502329 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -1030,7 +1030,7 @@ struct vfio_iommu_type1_info_cap_iova_range { * size in bytes that can be used by user applications when getting the dirty * bitmap. */ -#define VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION 1 +#define VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION 2 struct vfio_iommu_type1_info_cap_migration { struct vfio_info_cap_header header; |