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-Tag: baikal/mips/sdk6.1~5038
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=2caf4f1df034edacb1e3aa914a0f3c864a327cb4;p=kernel.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
---

2caf4f1df034edacb1e3aa914a0f3c864a327cb4