Merge tag 'vfio-v5.12-rc6' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Mar 2021 16:49:36 +0000 (09:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Mar 2021 16:49:36 +0000 (09:49 -0700)
commit17860ccabff533748c85ea32904abd6bae990099
treea693893cebd263144b6a35ebfd9c09dfbf152822
parente720e7d0e983bf05de80b231bccc39f1487f0f16
parente0146a108ce4d2c22b9510fd12268e3ee72a0161
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