]> git.ipfire.org Git - people/ms/linux.git/commitdiff
projects / people / ms / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5b36a4 afe4e37)
Merge tag 'vfio-v5.19-rc7' of https://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jul 2022 17:02:03 +0000 (10:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jul 2022 17:02:03 +0000 (10:02 -0700)
Pull VFIO fix from Alex Williamson:

 - Move IOMMU test to unbreak no-iommu support (Jason Gunthorpe)

* tag 'vfio-v5.19-rc7' of https://github.com/awilliam/linux-vfio:
  vfio: Move IOMMU_CAP_CACHE_COHERENCY test to after we know we have a group


Trivial merge
Michael's Linux tree.