From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Jun 2021 18:52:24 +0000 (-0700)
Subject: Merge tag 'vfio-v5.13-rc5' of git://github.com/awilliam/linux-vfio
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/f88cd3fb9df228e5ce4e13ec3dbad671ddb2146e

Merge tag 'vfio-v5.13-rc5' of git://github.com/awilliam/linux-vfio

Pull VFIO fixes from Alex Williamson:

 - Fix error path return value (Zhen Lei)

 - Add vfio-pci CONFIG_MMU dependency (Randy Dunlap)

 - Replace open coding with struct_size() (Gustavo A. R. Silva)

 - Fix sample driver error path (Wei Yongjun)

 - Fix vfio-platform error path module_put() (Max Gurtovoy)

* tag 'vfio-v5.13-rc5' of git://github.com/awilliam/linux-vfio:
  vfio/platform: fix module_put call in error flow
  samples: vfio-mdev: fix error handing in mdpy_fb_probe()
  vfio/iommu_type1: Use struct_size() for kzalloc()
  vfio/pci: zap_vma_ptes() needs MMU
  vfio/pci: Fix error return code in vfio_ecap_init()
---

f88cd3fb9df228e5ce4e13ec3dbad671ddb2146e