diff options
| author | Linus Torvalds <[email protected]> | 2021-03-30 16:49:36 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2021-03-30 16:49:36 +0000 |
| commit | 17860ccabff533748c85ea32904abd6bae990099 (patch) | |
| tree | a693893cebd263144b6a35ebfd9c09dfbf152822 /lib/xarray.c | |
| parent | mm: fix race by making init_zero_pfn() early_initcall (diff) | |
| parent | vfio/nvlink: Add missing SPAPR_TCE_IOMMU depends (diff) | |
| download | kernel-17860ccabff533748c85ea32904abd6bae990099.tar.gz kernel-17860ccabff533748c85ea32904abd6bae990099.zip | |
Merge tag 'vfio-v5.12-rc6' of git://github.com/awilliam/linux-vfio
Pull VFIO fixes from Alex Williamson:
- Fix pfnmap batch carryover (Daniel Jordan)
- Fix nvlink Kconfig dependency (Jason Gunthorpe)
* tag 'vfio-v5.12-rc6' of git://github.com/awilliam/linux-vfio:
vfio/nvlink: Add missing SPAPR_TCE_IOMMU depends
vfio/type1: Empty batch for pfnmap pages
Diffstat (limited to 'lib/xarray.c')
0 files changed, 0 insertions, 0 deletions