diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-08-18 14:12:04 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-08-18 14:12:04 -0400 |
| commit | b0e32e20e3c63778d8c20a40d8bec8b18baffecb (patch) | |
| tree | 2e0c3311c53889473b94d49132fe5b7cdee71d51 /drivers/infiniband/core/verbs.c | |
| parent | d3cf4d9915c4fb60aeef580973aa77420e600746 (diff) | |
| parent | 870201f95fcbd19538aef630393fe9d583eff82e (diff) | |
| download | linux-b0e32e20e3c63778d8c20a40d8bec8b18baffecb.tar.bz2 | |
Merge branch 'k.o/for-4.13-rc' into k.o/for-next
Merging our (hopefully) final -rc pull branch into our for-next branch
because some of our pending patches won't apply cleanly without having
the -rc patches in our tree.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/core/verbs.c')
| -rw-r--r-- | drivers/infiniband/core/verbs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c index 3d1de62de839..aa4a84ecf11a 100644 --- a/drivers/infiniband/core/verbs.c +++ b/drivers/infiniband/core/verbs.c @@ -895,7 +895,6 @@ static const struct { } qp_state_table[IB_QPS_ERR + 1][IB_QPS_ERR + 1] = { [IB_QPS_RESET] = { [IB_QPS_RESET] = { .valid = 1 }, - [IB_QPS_ERR] = { .valid = 1 }, [IB_QPS_INIT] = { .valid = 1, .req_param = { |