Commit d16b418f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f75f5d58 0f3e72b5

drivers/vfio/Makefile

+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

vfio_virqfd-y := virqfd.o



vfio-y += vfio_main.o



obj-$(CONFIG_VFIO) += vfio.o

obj-$(CONFIG_VFIO_VIRQFD) += vfio_virqfd.o

obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o

drivers/vfio/vfio.c→drivers/vfio/vfio_main.c

+0 −0

File moved.

View file