Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma' and...

diff --cc drivers/infiniband/core/cma.c
index 8734a6a,2e826f9,4d8f592,2e826f9,2e826f9,2e826f9,2e826f9..5a335b5
--- 1/drivers/infiniband/core/cma.c
--- 2/drivers/infiniband/core/cma.c
--- 3/drivers/infiniband/core/cma.c
--- 4/drivers/infiniband/core/cma.c
--- 5/drivers/infiniband/core/cma.c
--- 6/drivers/infiniband/core/cma.c
--- 7/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@@@@@@@ -2222,20 -2194,15 -2194,15 -2194,15 -2194,15 -2194,15 -2194,15 +2222,20 @@@@@@@@ static int cma_check_port(struct rdma_b
                if (id_priv == cur_id)
                        continue;
       
 ------         if ((cur_id->state == RDMA_CM_LISTEN) ||
 ------             !reuseaddr || !cur_id->reuseaddr) {
 ------                 cur_addr = (struct sockaddr *) &cur_id->id.route.addr.src_addr;
 ------                 if (cma_any_addr(cur_addr))
 ------                         return -EADDRNOTAVAIL;
 ++++++         if ((cur_id->state != RDMA_CM_LISTEN) && reuseaddr &&
 ++++++             cur_id->reuseaddr)
 ++++++                 continue;
  +    
 - ----                 if (!cma_addr_cmp(addr, cur_addr))
 - ----                         return -EADDRINUSE;
 - ----         }
 ++++++         cur_addr = (struct sockaddr *) &cur_id->id.route.addr.src_addr;
 ++++++         if (id_priv->afonly && cur_id->afonly &&
 ++++++             (addr->sa_family != cur_addr->sa_family))
 ++++++                 continue;
 ++++++
 ++++++         if (cma_any_addr(addr) || cma_any_addr(cur_addr))
 ++++++                 return -EADDRNOTAVAIL;
 + ++++
  -                     if (!cma_addr_cmp(addr, cur_addr))
  -                             return -EADDRINUSE;
  -             }
 ++++++         if (!cma_addr_cmp(addr, cur_addr))
 ++++++                 return -EADDRINUSE;
        }
        return 0;
       }

diff --cc drivers/infiniband/hw/mlx4/main.c
Simple merge