From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Sep 2021 23:06:31 +0000 (-0700)
Subject: Merge tag 'vfio-v5.15-rc4' of git://github.com/awilliam/linux-vfio
X-Git-Tag: v5.15~160
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62da74a735702e62ca910d41b4bb760bbd968e3a;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'vfio-v5.15-rc4' of git://github.com/awilliam/linux-vfio

Pull VFIO fixes from Alex Williamson:

 - Fix vfio-ap leak on uninit (Jason Gunthorpe)

 - Add missing prototype arg name (Colin Ian King)

* tag 'vfio-v5.15-rc4' of git://github.com/awilliam/linux-vfio:
  vfio/ap_ops: Add missed vfio_uninit_group_dev()
  vfio/pci: add missing identifier name in argument of function prototype
---

62da74a735702e62ca910d41b4bb760bbd968e3a