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

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

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma 

Pull rdma driver move from Doug Ledford:
 "This is a move only, no functional changes.

  I tried to get it in prior to the rc1 release, but we were waiting on
  IBM to get back to us that they were OK with the deprecation and
  eventual removal of this driver.  That OK didn't materialize until
  last week, so integration and testing time pushed us beyond the rc1
  release.

  Summary:

   - Move ehca driver to staging/rdma and schedule for deletion"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  IB/ehca: Deprecate driver, move to staging, schedule deletion
parents 30255100 447e9a4d

drivers/infiniband/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ config INFINIBAND_ADDR_TRANS 


source "drivers/infiniband/hw/mthca/Kconfig"

source "drivers/infiniband/hw/qib/Kconfig"

source "drivers/infiniband/hw/ehca/Kconfig"

source "drivers/infiniband/hw/cxgb3/Kconfig"

source "drivers/infiniband/hw/cxgb4/Kconfig"

source "drivers/infiniband/hw/mlx4/Kconfig"

drivers/infiniband/hw/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_INFINIBAND_MTHCA)		+= mthca/

obj-$(CONFIG_INFINIBAND_QIB)		+= qib/

obj-$(CONFIG_INFINIBAND_EHCA)		+= ehca/

obj-$(CONFIG_INFINIBAND_CXGB3)		+= cxgb3/

obj-$(CONFIG_INFINIBAND_CXGB4)		+= cxgb4/

obj-$(CONFIG_MLX4_INFINIBAND)		+= mlx4/

drivers/staging/rdma/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ if STAGING_RDMA 


source "drivers/staging/rdma/amso1100/Kconfig"



source "drivers/staging/rdma/ehca/Kconfig"



source "drivers/staging/rdma/hfi1/Kconfig"



source "drivers/staging/rdma/ipath/Kconfig"

drivers/staging/rdma/Makefile

+1 −0
Original line number Diff line number Diff line 
# Entries for RDMA_STAGING tree

obj-$(CONFIG_INFINIBAND_AMSO1100)	+= amso1100/

obj-$(CONFIG_INFINIBAND_EHCA)	+= ehca/

obj-$(CONFIG_INFINIBAND_HFI1)	+= hfi1/

obj-$(CONFIG_INFINIBAND_IPATH)	+= ipath/

drivers/infiniband/hw/ehca/Kconfig→drivers/staging/rdma/ehca/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ config INFINIBAND_EHCA 
	tristate "eHCA support"

	depends on IBMEBUS

	---help---

	This driver supports the IBM pSeries eHCA InfiniBand adapter.

	This driver supports the deprecated IBM pSeries eHCA InfiniBand

	adapter.



	To compile the driver as a module, choose M here. The module

	will be called ib_ehca.