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

Commit bc756235 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

Merge branch 'for-next-merge' of... 

Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending into vhost-net-next
parents c39904a0 b8d26b3b

drivers/infiniband/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -59,5 +59,6 @@ source "drivers/infiniband/ulp/srp/Kconfig" 
source "drivers/infiniband/ulp/srpt/Kconfig"



source "drivers/infiniband/ulp/iser/Kconfig"

source "drivers/infiniband/ulp/isert/Kconfig"



endif # INFINIBAND

drivers/infiniband/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,3 +13,4 @@ obj-$(CONFIG_INFINIBAND_IPOIB) += ulp/ipoib/ 
obj-$(CONFIG_INFINIBAND_SRP)		+= ulp/srp/

obj-$(CONFIG_INFINIBAND_SRPT)		+= ulp/srpt/

obj-$(CONFIG_INFINIBAND_ISER)		+= ulp/iser/

obj-$(CONFIG_INFINIBAND_ISERT)		+= ulp/isert/

drivers/infiniband/ulp/isert/Kconfig

0 → 100644
+5 −0
Original line number Diff line number Diff line 
config INFINIBAND_ISERT

	tristate "iSCSI Extentions for RDMA (iSER) target support"

	depends on INET && INFINIBAND_ADDR_TRANS && TARGET_CORE && ISCSI_TARGET

	---help---

	Support for iSCSI Extentions for RDMA (iSER) Target on Infiniband fabrics.

drivers/infiniband/ulp/isert/Makefile

0 → 100644
+2 −0
Original line number Diff line number Diff line 
ccflags-y		:= -Idrivers/target -Idrivers/target/iscsi

obj-$(CONFIG_INFINIBAND_ISERT)	+= ib_isert.o

drivers/infiniband/ulp/isert/ib_isert.c

0 → 100644
+2281 −0

File added.

Preview size limit exceeded, changes collapsed.