Skip to content

Commit d16b418

Browse files
torvaldstorvalds
committed
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
2 parents f75f5d5 + 0f3e72b commit d16b418

2 files changed

Lines changed: 2 additions & 0 deletions

File tree

‎drivers/vfio/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# SPDX-License-Identifier: GPL-2.0
22
vfio_virqfd-y := virqfd.o
33

4+
vfio-y += vfio_main.o
5+
46
obj-$(CONFIG_VFIO) += vfio.o
57
obj-$(CONFIG_VFIO_VIRQFD) += vfio_virqfd.o
68
obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o

drivers/vfio/vfio.c renamed to drivers/vfio/vfio_main.c

File renamed without changes.

0 commit comments

Comments
 (0)