From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Aug 2022 16:34:45 +0000 (-0700)
Subject: Merge tag 'vfio-v6.0-rc1pt2' of https://github.com/awilliam/linux-vfio
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d16b418fac3de0d2ac854b3a9a1a59a0ebf2a0e9;p=linux.git

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
---

d16b418fac3de0d2ac854b3a9a1a59a0ebf2a0e9