projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7bd807 42de956)
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)
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


Trivial merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git