Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 

Pull tcm_vhost level target fabric driver from Nicholas Bellinger:
 "Here is the PULL request for the initial merge of tcm_vhost based on
  RFC-v5 code with MST's ACK appended to the initial merge commit."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  tcm_vhost: Initial merge for vhost level target fabric driver
parents 21d2f8dc 057cbf49

drivers/vhost/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -9,3 +9,6 @@ config VHOST_NET 
	  To compile this driver as a module, choose M here: the module will

	  be called vhost_net.



if STAGING

source "drivers/vhost/Kconfig.tcm"

endif

drivers/vhost/Kconfig.tcm

0 → 100644
+6 −0
Original line number Diff line number Diff line 
config TCM_VHOST

	tristate "TCM_VHOST fabric module (EXPERIMENTAL)"

	depends on TARGET_CORE && EVENTFD && EXPERIMENTAL && m

	default n

	---help---

	Say M here to enable the TCM_VHOST fabric module for use with virtio-scsi guests

drivers/vhost/Makefile

+2 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_VHOST_NET) += vhost_net.o

vhost_net-y := vhost.o net.o



obj-$(CONFIG_TCM_VHOST) += tcm_vhost.o