diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-30 09:49:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-30 09:49:36 -0700 |
| commit | 17860ccabff533748c85ea32904abd6bae990099 (patch) | |
| tree | a693893cebd263144b6a35ebfd9c09dfbf152822 /ipc/sem.c | |
| parent | e720e7d0e983bf05de80b231bccc39f1487f0f16 (diff) | |
| parent | e0146a108ce4d2c22b9510fd12268e3ee72a0161 (diff) | |
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 'ipc/sem.c')
0 files changed, 0 insertions, 0 deletions