]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 77bbe7b 04afa04)
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)
commit2fcb6e94e38a7d72bcbe6ee3ca3a7317dd9c2dee
treea693893cebd263144b6a35ebfd9c09dfbf152822tree | snapshot
parent77bbe7bc26f82474ca859ac4f5f11762217fe20dcommit | diff
parent04afa044b79f3525415fb8664aefd22ba8b5f551commit | 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
Linux Kernel Source Tree.