Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6

2016-03-21 17:32:23 -04:00
parent 34abf9ed73 68996a6e76 5511d78107
commit 520a07bff6
224 changed files with 24076 additions and 17256 deletions
--- a/include/uapi/rdma/rdma_netlink.h
+++ b/include/uapi/rdma/rdma_netlink.h
@@ -5,8 +5,8 @@

 enum {
 	RDMA_NL_RDMA_CM = 1,
-	RDMA_NL_NES,
-	RDMA_NL_C4IW,
+	RDMA_NL_IWCM,
+	RDMA_NL_RSVD,
 	RDMA_NL_LS,	/* RDMA Local Services */
 	RDMA_NL_I40IW,
 	RDMA_NL_NUM_CLIENTS