Merge branches 'mlx4', 'mlx5' and 'ocrdma' into k.o/for-4.6

This commit is contained in:
Doug Ledford
2016-03-16 13:38:28 -04:00
49 ändrade filer med 2455 tillägg och 359 borttagningar

Visa fil

@@ -963,7 +963,8 @@ int c4iw_map_mr_sg(struct ib_mr *ibmr,
struct scatterlist *sg,
int sg_nents);
int c4iw_dealloc_mw(struct ib_mw *mw);
struct ib_mw *c4iw_alloc_mw(struct ib_pd *pd, enum ib_mw_type type);
struct ib_mw *c4iw_alloc_mw(struct ib_pd *pd, enum ib_mw_type type,
struct ib_udata *udata);
struct ib_mr *c4iw_reg_user_mr(struct ib_pd *pd, u64 start,
u64 length, u64 virt, int acc,
struct ib_udata *udata);