4 files changed, 39 insertions, 3 deletions

diff --git a/Documentation/ABI/testing/configfs-rdma_cm b/Documentation/ABI/testing/configfs-rdma_cm
new file mode 100644
index 000000000000..5c389aaf5291
--- /dev/null
+++ b/Documentation/ABI/testing/configfs-rdma_cm
@@ -0,0 +1,22 @@
+What:           /config/rdma_cm
+Date:           November 29, 2015
+KernelVersion:  4.4.0
+Description:    Interface is used to configure RDMA-cable HCAs in respect to
+                RDMA-CM attributes.
+
+                Attributes are visible only when configfs is mounted. To mount
+                configfs in /config directory use:
+                # mount -t configfs none /config/
+
+                In order to set parameters related to a specific HCA, a directory
+                for this HCA has to be created:
+                mkdir -p /config/rdma_cm/<hca>
+
+
+What:           /config/rdma_cm/<hca>/ports/<port-num>/default_roce_mode
+Date:           November 29, 2015
+KernelVersion:  4.4.0
+Description:    RDMA-CM based connections from HCA <hca> at port <port-num>
+                will be initiated with this RoCE type as default.
+                The possible RoCE types are either "IB/RoCE v1" or "RoCE v2".
+                This parameter has RW access.
diff --git a/Documentation/ABI/testing/sysfs-class-infiniband b/Documentation/ABI/testing/sysfs-class-infiniband
new file mode 100644
index 000000000000..a86abe66a316
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-infiniband
@@ -0,0 +1,16 @@
+What:           /sys/class/infiniband/<hca>/ports/<port-number>/gid_attrs/ndevs/<gid-index>
+Date:           November 29, 2015
+KernelVersion:  4.4.0
+Contact:        linux-rdma@vger.kernel.org
+Description:    The net-device's name associated with the GID resides
+                at index <gid-index>.
+
+What:           /sys/class/infiniband/<hca>/ports/<port-number>/gid_attrs/types/<gid-index>
+Date:           November 29, 2015
+KernelVersion:  4.4.0
+Contact:        linux-rdma@vger.kernel.org
+Description:    The RoCE type of the associated GID resides at index <gid-index>.
+                This could either be "IB/RoCE v1" for IB and RoCE v1 based GODs
+                or "RoCE v2" for RoCE v2 based GIDs.
+
+
diff --git a/Documentation/infiniband/core_locking.txt b/Documentation/infiniband/core_locking.txt
index e1678542279a..4b1f36b6ada0 100644
--- a/Documentation/infiniband/core_locking.txt
+++ b/Documentation/infiniband/core_locking.txt
@@ -15,7 +15,6 @@ Sleeping and interrupt context
     modify_ah
     query_ah
     destroy_ah
-    bind_mw
     post_send
     post_recv
     poll_cq
@@ -31,7 +30,6 @@ Sleeping and interrupt context
     ib_modify_ah
     ib_query_ah
     ib_destroy_ah
-    ib_bind_mw
     ib_post_send
     ib_post_recv
     ib_req_notify_cq
diff --git a/Documentation/kernel-per-CPU-kthreads.txt b/Documentation/kernel-per-CPU-kthreads.txt
index f4cbfe0ba108..edec3a3e648d 100644
--- a/Documentation/kernel-per-CPU-kthreads.txt
+++ b/Documentation/kernel-per-CPU-kthreads.txt
@@ -90,7 +90,7 @@ BLOCK_SOFTIRQ:  Do all of the following:
         from being initiated from tasks that might run on the CPU to
         be de-jittered.  (It is OK to force this CPU offline and then
         bring it back online before you start your application.)
-BLOCK_IOPOLL_SOFTIRQ:  Do all of the following:
+IRQ_POLL_SOFTIRQ:  Do all of the following:
 1.      Force block-device interrupts onto some other CPU.
 2.      Initiate any block I/O and block-I/O polling on other CPUs.
 3.      Once your application has started, prevent CPU-hotplug operations