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

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

Linus Torvalds 72714841 30255100

+9 -3
-1
drivers/infiniband/Kconfig
··· 56 56 57 57 source "drivers/infiniband/hw/mthca/Kconfig" 58 58 source "drivers/infiniband/hw/qib/Kconfig" 59 - source "drivers/infiniband/hw/ehca/Kconfig" 60 59 source "drivers/infiniband/hw/cxgb3/Kconfig" 61 60 source "drivers/infiniband/hw/cxgb4/Kconfig" 62 61 source "drivers/infiniband/hw/mlx4/Kconfig"
-1
drivers/infiniband/hw/Makefile
··· 1 1 obj-$(CONFIG_INFINIBAND_MTHCA) += mthca/ 2 2 obj-$(CONFIG_INFINIBAND_QIB) += qib/ 3 - obj-$(CONFIG_INFINIBAND_EHCA) += ehca/ 4 3 obj-$(CONFIG_INFINIBAND_CXGB3) += cxgb3/ 5 4 obj-$(CONFIG_INFINIBAND_CXGB4) += cxgb4/ 6 5 obj-$(CONFIG_MLX4_INFINIBAND) += mlx4/
+2 -1
drivers/infiniband/hw/ehca/Kconfig drivers/staging/rdma/ehca/Kconfig
··· 2 2 tristate "eHCA support" 3 3 depends on IBMEBUS 4 4 ---help--- 5 - This driver supports the IBM pSeries eHCA InfiniBand adapter. 5 + This driver supports the deprecated IBM pSeries eHCA InfiniBand 6 + adapter. 6 7 7 8 To compile the driver as a module, choose M here. The module 8 9 will be called ib_ehca.
drivers/infiniband/hw/ehca/Makefile drivers/staging/rdma/ehca/Makefile
drivers/infiniband/hw/ehca/ehca_av.c drivers/staging/rdma/ehca/ehca_av.c
drivers/infiniband/hw/ehca/ehca_classes.h drivers/staging/rdma/ehca/ehca_classes.h
drivers/infiniband/hw/ehca/ehca_classes_pSeries.h drivers/staging/rdma/ehca/ehca_classes_pSeries.h
drivers/infiniband/hw/ehca/ehca_cq.c drivers/staging/rdma/ehca/ehca_cq.c
drivers/infiniband/hw/ehca/ehca_eq.c drivers/staging/rdma/ehca/ehca_eq.c
drivers/infiniband/hw/ehca/ehca_hca.c drivers/staging/rdma/ehca/ehca_hca.c
drivers/infiniband/hw/ehca/ehca_irq.c drivers/staging/rdma/ehca/ehca_irq.c
drivers/infiniband/hw/ehca/ehca_irq.h drivers/staging/rdma/ehca/ehca_irq.h
drivers/infiniband/hw/ehca/ehca_iverbs.h drivers/staging/rdma/ehca/ehca_iverbs.h
drivers/infiniband/hw/ehca/ehca_main.c drivers/staging/rdma/ehca/ehca_main.c
drivers/infiniband/hw/ehca/ehca_mcast.c drivers/staging/rdma/ehca/ehca_mcast.c
drivers/infiniband/hw/ehca/ehca_mrmw.c drivers/staging/rdma/ehca/ehca_mrmw.c
drivers/infiniband/hw/ehca/ehca_mrmw.h drivers/staging/rdma/ehca/ehca_mrmw.h
drivers/infiniband/hw/ehca/ehca_pd.c drivers/staging/rdma/ehca/ehca_pd.c
drivers/infiniband/hw/ehca/ehca_qes.h drivers/staging/rdma/ehca/ehca_qes.h
drivers/infiniband/hw/ehca/ehca_qp.c drivers/staging/rdma/ehca/ehca_qp.c
drivers/infiniband/hw/ehca/ehca_reqs.c drivers/staging/rdma/ehca/ehca_reqs.c
drivers/infiniband/hw/ehca/ehca_sqp.c drivers/staging/rdma/ehca/ehca_sqp.c
drivers/infiniband/hw/ehca/ehca_tools.h drivers/staging/rdma/ehca/ehca_tools.h
drivers/infiniband/hw/ehca/ehca_uverbs.c drivers/staging/rdma/ehca/ehca_uverbs.c
drivers/infiniband/hw/ehca/hcp_if.c drivers/staging/rdma/ehca/hcp_if.c
drivers/infiniband/hw/ehca/hcp_if.h drivers/staging/rdma/ehca/hcp_if.h
drivers/infiniband/hw/ehca/hcp_phyp.c drivers/staging/rdma/ehca/hcp_phyp.c
drivers/infiniband/hw/ehca/hcp_phyp.h drivers/staging/rdma/ehca/hcp_phyp.h
drivers/infiniband/hw/ehca/hipz_fns.h drivers/staging/rdma/ehca/hipz_fns.h
drivers/infiniband/hw/ehca/hipz_fns_core.h drivers/staging/rdma/ehca/hipz_fns_core.h
drivers/infiniband/hw/ehca/hipz_hw.h drivers/staging/rdma/ehca/hipz_hw.h
drivers/infiniband/hw/ehca/ipz_pt_fn.c drivers/staging/rdma/ehca/ipz_pt_fn.c
drivers/infiniband/hw/ehca/ipz_pt_fn.h drivers/staging/rdma/ehca/ipz_pt_fn.h
+2
drivers/staging/rdma/Kconfig
··· 24 24 25 25 source "drivers/staging/rdma/amso1100/Kconfig" 26 26 27 + source "drivers/staging/rdma/ehca/Kconfig" 28 + 27 29 source "drivers/staging/rdma/hfi1/Kconfig" 28 30 29 31 source "drivers/staging/rdma/ipath/Kconfig"
+1
drivers/staging/rdma/Makefile
··· 1 1 # Entries for RDMA_STAGING tree 2 2 obj-$(CONFIG_INFINIBAND_AMSO1100) += amso1100/ 3 + obj-$(CONFIG_INFINIBAND_EHCA) += ehca/ 3 4 obj-$(CONFIG_INFINIBAND_HFI1) += hfi1/ 4 5 obj-$(CONFIG_INFINIBAND_IPATH) += ipath/
+4
drivers/staging/rdma/ehca/TODO
··· 1 + 9/2015 2 + 3 + The ehca driver has been deprecated and moved to drivers/staging/rdma. 4 + It will be removed in the 4.6 merge window.