Merge branch 'misc' into k.o/for-next

2017-07-27 09:00:38 -04:00
parent f55c1e6608 67cbe3532c
commit a5f66725c7
43 changed files with 693 additions and 279 deletions
--- a/include/uapi/rdma/qedr-abi.h
+++ b/include/uapi/rdma/qedr-abi.h
@@ -49,6 +49,9 @@ struct qedr_alloc_ucontext_resp {
 	__u32 sges_per_recv_wr;
 	__u32 sges_per_srq_wr;
 	__u32 max_cqes;
+	__u8 dpm_enabled;
+	__u8 wids_enabled;
+	__u16 wid_count;
 };

 struct qedr_alloc_pd_ureq {