Staging: Add staging/rdma directory and update MAINTAINERS

Create the rdma directory in the staging area for use as we deprecate
some older drivers and as we bring in some new drivers that are in
need of work.  Update the MAINTAINERS file so that updates to these
files go to linux-rdma@vger.kernel.org.  Expected lifespan of this
directory is three releases for any deprecated drivers moved here
and an unknown, but theoretically bounded amount of time for the new
drivers as a new core RDMA transfer library needs to be written and
the drivers modified to use it in order for them to move out of this
directory.

Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 569568f6644f2092211b7bb2690c7defe49977dd..a82aa07366d14f12681753639d9a2b99c6273c49 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5278,6 +5278,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git
 S:     Supported
 F:     Documentation/infiniband/
 F:     drivers/infiniband/
+F:     drivers/staging/rdma/
 F:     include/uapi/linux/if_infiniband.h
 F:     include/uapi/rdma/
 F:     include/rdma/

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 7f6cae5beb90fc30388be0281a5c5b9f9023bad4..936016f74afeca955ca2cfd3ba7ac10d65b17fea 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -74,6 +74,8 @@ source "drivers/staging/nvec/Kconfig"
 
 source "drivers/staging/media/Kconfig"
 
+source "drivers/staging/rdma/Kconfig"
+
 source "drivers/staging/android/Kconfig"
 
 source "drivers/staging/board/Kconfig"

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 347f6477aa3eb4a11429c977f73596e520fb403c..c6c44545b94a53c8f78bbf03bd3e0c6a18020975 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_FT1000)          += ft1000/
 obj-$(CONFIG_SPEAKUP)          += speakup/
 obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)   += ste_rmi4/
 obj-$(CONFIG_MFD_NVEC)         += nvec/
+obj-$(CONFIG_STAGING_RDMA)     += rdma/
 obj-$(CONFIG_ANDROID)          += android/
 obj-$(CONFIG_STAGING_BOARD)    += board/
 obj-$(CONFIG_USB_WPAN_HCD)     += ozwpan/

diff --git a/drivers/staging/rdma/Kconfig b/drivers/staging/rdma/Kconfig
new file mode 100644 (file)
index 0000000..0bff438
--- /dev/null
+++ b/drivers/staging/rdma/Kconfig
@@ -0,0 +1,25 @@
+menuconfig STAGING_RDMA
+        bool "RDMA staging drivers"
+       depends on INFINIBAND
+       depends on PCI || BROKEN
+       depends on HAS_IOMEM
+       depends on NET
+       depends on INET
+        default n
+        ---help---
+          This option allows you to select a number of RDMA drivers that
+         fall into one of two categories: deprecated drivers being held
+         here before finally being removed or new drivers that still need
+         some work before being moved to the normal RDMA driver area.
+
+          If you wish to work on these drivers, to help improve them, or
+          to report problems you have with them, please use the
+         linux-rdma@vger.kernel.org mailing list.
+
+          If in doubt, say N here.
+
+
+# Please keep entries in alphabetic order
+if STAGING_RDMA
+
+endif

diff --git a/drivers/staging/rdma/Makefile b/drivers/staging/rdma/Makefile
new file mode 100644 (file)
index 0000000..b5e94f1
--- /dev/null
+++ b/drivers/staging/rdma/Makefile
@@ -0,0 +1 @@
+# Entries for RDMA_STAGING tree