Merge tag 'vfio-v6.0-rc1pt2' of https://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Aug 2022 16:34:45 +0000 (09:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Aug 2022 16:34:45 +0000 (09:34 -0700)
commitd16b418fac3de0d2ac854b3a9a1a59a0ebf2a0e9
treec5bafc125d8d63aade3b893bcb9cbc53cb1c8d90
parentf75f5d58099ffe0a70ae96dfeb837b5c46399da3
parent0f3e72b5c8cfa0b57dc4fc7703a0a42dbc200ba9
Merge tag 'vfio-v6.0-rc1pt2' of https://github.com/awilliam/linux-vfio

Pull another VFIO update from Alex Williamson:

 - Rename vfio source file to more easily allow additional source
   files in the upcoming development cycles (Jason Gunthorpe)

* tag 'vfio-v6.0-rc1pt2' of https://github.com/awilliam/linux-vfio:
  vfio: Move vfio.c to vfio_main.c