Merge branches 'nes', 'cxgb4' and 'iwpm' into k.o/for-4.6

diff --cc drivers/infiniband/hw/cxgb4/cm.c
index cd2ff5f9518a2b7143d53821672a5d98b9773b17,cd2ff5f9518a2b7143d53821672a5d98b9773b17,8cd7b5e4b03dcfec55fb975bca1abda60b14e6a0,61518830ba11aedb72cf10abedee017e4263754c..651711370d557f1798fdac34e2b57b9f15c1b3cf
--- 1/drivers/infiniband/hw/cxgb4/cm.c
--- 2/drivers/infiniband/hw/cxgb4/cm.c
--- 3/drivers/infiniband/hw/cxgb4/cm.c
--- 4/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@@@@ -2038,10 -2038,10 -2053,10 -1984,10 +1999,10 @@@@@ static int c4iw_reconnect(struct c4iw_e
        insert_handle(ep->com.dev, &ep->com.dev->atid_idr, ep, ep->atid);
    
        /* find a route */
---     if (ep->com.cm_id->local_addr.ss_family == AF_INET) {
+++     if (ep->com.cm_id->m_local_addr.ss_family == AF_INET) {
                ep->dst = find_route(ep->com.dev, laddr->sin_addr.s_addr,
                                     raddr->sin_addr.s_addr, laddr->sin_port,
-- -                                 raddr->sin_port, 0);
++ +                                 raddr->sin_port, ep->com.cm_id->tos);
                iptype = 4;
                ra = (__u8 *)&raddr->sin_addr;
        } else {

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

diff --cc drivers/infiniband/hw/cxgb4/iw_cxgb4.h
Simple merge

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

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

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

diff --cc drivers/infiniband/hw/nes/nes_cm.c
Simple merge

diff --cc drivers/infiniband/hw/nes/nes_verbs.c
Simple merge