Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

vdpa: move to drivers/vdpa

We have both vhost and virtio drivers that depend on vdpa.
It's easier to locate it at a top level directory otherwise
we run into issues e.g. if vhost is built-in but virtio
is modular. Let's just move it up a level.

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

+4 -3
+1
MAINTAINERS
··· 17695 17695 S: Maintained 17696 17696 F: Documentation/devicetree/bindings/virtio/ 17697 17697 F: drivers/virtio/ 17698 + F: drivers/vdpa/ 17698 17699 F: tools/virtio/ 17699 17700 F: drivers/net/virtio_net.c 17700 17701 F: drivers/block/virtio_blk.c
+2
drivers/Kconfig
··· 138 138 139 139 source "drivers/virtio/Kconfig" 140 140 141 + source "drivers/vdpa/Kconfig" 142 + 141 143 source "drivers/vhost/Kconfig" 142 144 143 145 source "drivers/hv/Kconfig"
+1
drivers/Makefile
··· 42 42 obj-y += soc/ 43 43 44 44 obj-$(CONFIG_VIRTIO) += virtio/ 45 + obj-$(CONFIG_VDPA) += vdpa/ 45 46 obj-$(CONFIG_XEN) += xen/ 46 47 47 48 # regulators early, since some subsystems rely on them to initialize
-2
drivers/virtio/Kconfig
··· 109 109 If unsure, say 'N'. 110 110 111 111 endif # VIRTIO_MENU 112 - 113 - source "drivers/virtio/vdpa/Kconfig"
-1
drivers/virtio/Makefile
··· 7 7 obj-$(CONFIG_VIRTIO_BALLOON) += virtio_balloon.o 8 8 obj-$(CONFIG_VIRTIO_INPUT) += virtio_input.o 9 9 obj-$(CONFIG_VIRTIO_VDPA) += virtio_vdpa.o 10 - obj-$(CONFIG_VDPA) += vdpa/
drivers/virtio/vdpa/Kconfig drivers/vdpa/Kconfig
drivers/virtio/vdpa/Makefile drivers/vdpa/Makefile
drivers/virtio/vdpa/ifcvf/Makefile drivers/vdpa/ifcvf/Makefile
drivers/virtio/vdpa/ifcvf/ifcvf_base.c drivers/vdpa/ifcvf/ifcvf_base.c
drivers/virtio/vdpa/ifcvf/ifcvf_base.h drivers/vdpa/ifcvf/ifcvf_base.h
drivers/virtio/vdpa/ifcvf/ifcvf_main.c drivers/vdpa/ifcvf/ifcvf_main.c
drivers/virtio/vdpa/vdpa.c drivers/vdpa/vdpa.c
drivers/virtio/vdpa/vdpa_sim/Makefile drivers/vdpa/vdpa_sim/Makefile
drivers/virtio/vdpa/vdpa_sim/vdpa_sim.c drivers/vdpa/vdpa_sim/vdpa_sim.c