From: Doug Ledford <dledford@redhat.com>
Date: Mon, 21 Mar 2016 21:32:23 +0000 (-0400)
Subject: Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6
X-Git-Tag: v4.6-rc1~47^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=520a07bff6fbb23cac905007d74c67058b189acb;p=platform%2Fkernel%2Flinux-exynos.git

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

520a07bff6fbb23cac905007d74c67058b189acb
diff --cc include/uapi/rdma/rdma_netlink.h
index 4fa418d,f7d7b6f,c19a5dc..6e373d1
--- a/include/uapi/rdma/rdma_netlink.h
+++ b/include/uapi/rdma/rdma_netlink.h
@@@@ -5,10 -5,9 -5,9 +5,10 @@@@
   
   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
   };