leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'k.o/for-4.10-rc' into HEAD

Browse Source
This commit is contained in:
Doug Ledford
2017-02-19 09:18:21 -05:00
parent 6df6b4a9ce 646ebd4166
commit 6dd7abae71
30 changed files with 283 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/uapi/rdma/Kbuild
View File

@@ -17,3 +17,4 @@ header-y += nes-abi.h
header-y += ocrdma-abi.h
header-y += hns-abi.h
header-y += vmw_pvrdma-abi.h
header-y += qedr-abi.h

2
include/uapi/rdma/cxgb3-abi.h
View File

@@ -30,7 +30,7 @@
* SOFTWARE.
*/
#ifndef CXGB3_ABI_USER_H
#define CXBG3_ABI_USER_H
#define CXGB3_ABI_USER_H
#include <linux/types.h>

11
include/uapi/rdma/ib_user_verbs.h
View File

@@ -37,7 +37,6 @@
#define IB_USER_VERBS_H
#include <linux/types.h>
#include <rdma/ib_verbs.h>
/*
* Increment this value if any changes that break userspace ABI
@@ -548,11 +547,17 @@ enum {
};
enum {
IB_USER_LEGACY_LAST_QP_ATTR_MASK = IB_QP_DEST_QPN
/*
* This value is equal to IB_QP_DEST_QPN.
*/
IB_USER_LEGACY_LAST_QP_ATTR_MASK = 1ULL << 20,
};
enum {
IB_USER_LAST_QP_ATTR_MASK = IB_QP_RATE_LIMIT
/*
* This value is equal to IB_QP_RATE_LIMIT.
*/
IB_USER_LAST_QP_ATTR_MASK = 1ULL << 25,
};
struct ib_uverbs_ex_create_qp {