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

diff --cc drivers/infiniband/core/cma.c
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/cm.c
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/device.c
Simple merge

diff --cc drivers/infiniband/hw/qedr/qedr_cm.c
Simple merge

diff --cc drivers/infiniband/hw/qedr/verbs.c
Simple merge

diff --cc drivers/infiniband/sw/rxe/rxe_mr.c
Simple merge

diff --cc drivers/infiniband/sw/rxe/rxe_net.c
Simple merge

diff --cc drivers/infiniband/sw/rxe/rxe_qp.c
Simple merge

diff --cc drivers/infiniband/sw/rxe/rxe_resp.c
index 7bf20ced2078d933b2096db39f5f906748342709,5bcf073289729bd881960e8f797af1aa82e3b5bc..d404a8aba7afcaf8ab8addd38949ddf5adcd0847
--- 1/drivers/infiniband/sw/rxe/rxe_resp.c
--- 2/drivers/infiniband/sw/rxe/rxe_resp.c
+++ b/drivers/infiniband/sw/rxe/rxe_resp.c
@@@ -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;

diff --cc include/rdma/ib_verbs.h
Simple merge

diff --cc include/uapi/rdma/Kbuild
Simple merge