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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/Kconfig
Simple merge

diff --cc include/rdma/ib_verbs.h
Simple merge

diff --cc include/uapi/rdma/rdma_netlink.h
index 4fa418de4075a9196ca36bd8e0871a6007b59f84,f7d7b6fec9350fdfe01541716cee357fdf530435,c19a5dc1531af5df6f58ec8fadb41fe51c7afc3d..6e373d151cad750ee637fea41800652d02548681
--- 1/include/uapi/rdma/rdma_netlink.h
--- 2/include/uapi/rdma/rdma_netlink.h
--- 3/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
   };