Merge tag 'vfio-v5.15-rc4' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Sep 2021 23:06:31 +0000 (16:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Sep 2021 23:06:31 +0000 (16:06 -0700)
commit62da74a735702e62ca910d41b4bb760bbd968e3a
tree51ee5be7cd3ab27fa1b5659c82a953ac37574d19
parente7bd807e8c9e37b0eef24e13df1f0619c39dc559
parent42de956ca7e5f6c47048dde640f797e783b23198
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