diff options
| author | Roland Dreier <roland@purestorage.com> | 2015-02-03 18:29:25 +0100 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2015-02-03 18:29:25 +0100 |
| commit | ecb7b1233c532c60fa7a8927a43944e69f6e6b1a (patch) | |
| tree | 095b671c774ac9e820def16f8d159ee361fa767e | |
| parent | Revert "IPoIB: Consolidate rtnl_lock tasks in workqueue" (diff) | |
| parent | IB/core: Temporarily disable ex_query_device uverb (diff) | |
| download | linux-ecb7b1233c532c60fa7a8927a43944e69f6e6b1a.tar.xz linux-ecb7b1233c532c60fa7a8927a43944e69f6e6b1a.zip | |
Merge branches 'ipoib' and 'odp' into for-next
| -rw-r--r-- | drivers/infiniband/core/uverbs_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c index e6c23b9eab33..5db1a8cc388d 100644 --- a/drivers/infiniband/core/uverbs_main.c +++ b/drivers/infiniband/core/uverbs_main.c @@ -123,7 +123,6 @@ static int (*uverbs_ex_cmd_table[])(struct ib_uverbs_file *file, struct ib_udata *uhw) = { [IB_USER_VERBS_EX_CMD_CREATE_FLOW] = ib_uverbs_ex_create_flow, [IB_USER_VERBS_EX_CMD_DESTROY_FLOW] = ib_uverbs_ex_destroy_flow, - [IB_USER_VERBS_EX_CMD_QUERY_DEVICE] = ib_uverbs_ex_query_device }; static void ib_uverbs_add_one(struct ib_device *device); |