]> git.baikalelectronics.ru Git - kernel.git/commitdiff
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)
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


Trivial merge