From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Mar 2021 16:49:36 +0000 (-0700)
Subject: Merge tag 'vfio-v5.12-rc6' of git://github.com/awilliam/linux-vfio
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=17860ccabff533748c85ea32904abd6bae990099;p=linux.git

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
---

17860ccabff533748c85ea32904abd6bae990099