]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit51de326a1efd62e660b50a82546f32ab3f49f896
treea693893cebd263144b6a35ebfd9c09dfbf152822
parenteceb9a55c96aa6c36952407ab39c584dc7da8a68
parent456a39c26919032689362ac0a20e5986e0d0ae8a
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