[GIT PULL] VFIO fixes for v5.12-rc6

From: Alex Williamson
Date: Tue Mar 30 2021 - 12:49:41 EST


Hi Linus,

The following changes since commit 0d02ec6b3136c73c09e7859f0d0e4e2c4c07b49b:

Linux 5.12-rc4 (2021-03-21 14:56:43 -0700)

are available in the Git repository at:

git://github.com/awilliam/linux-vfio.git tags/vfio-v5.12-rc6

for you to fetch changes up to e0146a108ce4d2c22b9510fd12268e3ee72a0161:

vfio/nvlink: Add missing SPAPR_TCE_IOMMU depends (2021-03-29 14:48:00 -0600)

----------------------------------------------------------------
VFIO fixes for v5.12-rc6

- Fix pfnmap batch carryover (Daniel Jordan)

- Fix nvlink Kconfig dependency (Jason Gunthorpe)

----------------------------------------------------------------
Daniel Jordan (1):
vfio/type1: Empty batch for pfnmap pages

Jason Gunthorpe (1):
vfio/nvlink: Add missing SPAPR_TCE_IOMMU depends

drivers/vfio/pci/Kconfig | 2 +-
drivers/vfio/vfio_iommu_type1.c | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)