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

Commit 6f94ba20 authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge branch 'vmw_pvrdma' into merge-test

parents 9032ad78 29c8d9eb

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -12924,6 +12924,13 @@ S: Maintained 
F:	drivers/scsi/vmw_pvscsi.c

F:	drivers/scsi/vmw_pvscsi.h



VMWARE PVRDMA DRIVER

M:	Adit Ranadive <aditr@vmware.com>

M:	VMware PV-Drivers <pv-drivers@vmware.com>

L:	linux-rdma@vger.kernel.org

S:	Maintained

F:	drivers/infiniband/hw/vmw_pvrdma/



VOLTAGE AND CURRENT REGULATOR FRAMEWORK

M:	Liam Girdwood <lgirdwood@gmail.com>

M:	Mark Brown <broonie@kernel.org>

drivers/infiniband/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ source "drivers/infiniband/hw/mlx4/Kconfig" 
source "drivers/infiniband/hw/mlx5/Kconfig"

source "drivers/infiniband/hw/nes/Kconfig"

source "drivers/infiniband/hw/ocrdma/Kconfig"

source "drivers/infiniband/hw/vmw_pvrdma/Kconfig"

source "drivers/infiniband/hw/usnic/Kconfig"

source "drivers/infiniband/hw/hns/Kconfig"

drivers/infiniband/hw/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ obj-$(CONFIG_MLX4_INFINIBAND) += mlx4/ 
obj-$(CONFIG_MLX5_INFINIBAND)		+= mlx5/

obj-$(CONFIG_INFINIBAND_NES)		+= nes/

obj-$(CONFIG_INFINIBAND_OCRDMA)		+= ocrdma/

obj-$(CONFIG_INFINIBAND_VMWARE_PVRDMA)	+= vmw_pvrdma/

obj-$(CONFIG_INFINIBAND_USNIC)		+= usnic/

obj-$(CONFIG_INFINIBAND_HFI1)		+= hfi1/

obj-$(CONFIG_INFINIBAND_HNS)		+= hns/

drivers/infiniband/hw/vmw_pvrdma/Kconfig

0 → 100644
+7 −0
Original line number Diff line number Diff line 
config INFINIBAND_VMWARE_PVRDMA

	tristate "VMware Paravirtualized RDMA Driver"

	depends on NETDEVICES && ETHERNET && PCI && INET && VMXNET3

	---help---

	  This driver provides low-level support for VMware Paravirtual

	  RDMA adapter. It interacts with the VMXNet3 driver to provide

	  Ethernet capabilities.

drivers/infiniband/hw/vmw_pvrdma/Makefile

0 → 100644
+3 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_INFINIBAND_VMWARE_PVRDMA) += vmw_pvrdma.o



vmw_pvrdma-y := pvrdma_cmd.o pvrdma_cq.o pvrdma_doorbell.o pvrdma_main.o pvrdma_misc.o pvrdma_mr.o pvrdma_qp.o pvrdma_verbs.o