Merge branch 'k.o/for-4.10-rc' into HEAD
authorDoug Ledford <dledford@redhat.com>
Sun, 19 Feb 2017 14:18:21 +0000 (09:18 -0500)
committerDoug Ledford <dledford@redhat.com>
Sun, 19 Feb 2017 14:18:21 +0000 (09:18 -0500)
1  2 
drivers/infiniband/core/cma.c
drivers/infiniband/hw/cxgb4/cm.c
drivers/infiniband/hw/cxgb4/device.c
drivers/infiniband/hw/qedr/qedr_cm.c
drivers/infiniband/hw/qedr/verbs.c
drivers/infiniband/sw/rxe/rxe_mr.c
drivers/infiniband/sw/rxe/rxe_net.c
drivers/infiniband/sw/rxe/rxe_qp.c
drivers/infiniband/sw/rxe/rxe_resp.c
include/rdma/ib_verbs.h
include/uapi/rdma/Kbuild

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 7bf20ced2078d933b2096db39f5f906748342709,5bcf073289729bd881960e8f797af1aa82e3b5bc..d404a8aba7afcaf8ab8addd38949ddf5adcd0847
@@@ -476,10 -476,10 +476,10 @@@ static enum resp_states check_rkey(stru
                if (resid > mtu) {
                        if (pktlen != mtu || bth_pad(pkt)) {
                                state = RESPST_ERR_LENGTH;
 -                              goto err2;
 +                              goto err;
                        }
  
-                       resid = mtu;
+                       qp->resp.resid = mtu;
                } else {
                        if (pktlen != resid) {
                                state = RESPST_ERR_LENGTH;
Simple merge
Simple merge