Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5',...

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/mlx4/qp.c
index 41308af,41308af,41308af,41308af,41308af,41308af,b256009,41308af,a0bfda2,41308af,41308af,41308af,41308af..5b0cb8e
--- 1/drivers/infiniband/hw/mlx4/qp.c
--- 2/drivers/infiniband/hw/mlx4/qp.c
--- 3/drivers/infiniband/hw/mlx4/qp.c
--- 4/drivers/infiniband/hw/mlx4/qp.c
--- 5/drivers/infiniband/hw/mlx4/qp.c
--- 6/drivers/infiniband/hw/mlx4/qp.c
--- 7/drivers/infiniband/hw/mlx4/qp.c
--- 8/drivers/infiniband/hw/mlx4/qp.c
--- 9/drivers/infiniband/hw/mlx4/qp.c
--- 10/drivers/infiniband/hw/mlx4/qp.c
--- 11/drivers/infiniband/hw/mlx4/qp.c
--- 12/drivers/infiniband/hw/mlx4/qp.c
--- 13/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@@@@@@@@@@@@@ -608,9 -608,9 -608,9 -608,9 -608,9 -608,9 -608,19 -608,9 -608,10 -608,9 -608,9 -608,9 -608,9 +608,20 @@@@@@@@@@@@@@ static int qp_has_rq(struct ib_qp_init_
                return !attr->srq;
             }
             
++++++ ++++++static int qp0_enabled_vf(struct mlx4_dev *dev, int qpn)
++++++ ++++++{
++++++ ++++++   int i;
++++++ ++++++   for (i = 0; i < dev->caps.num_ports; i++) {
++++++ ++++++           if (qpn == dev->caps.qp0_proxy[i])
++++++ ++++++                   return !!dev->caps.qp0_qkey[i];
++++++ ++++++   }
++++++ ++++++   return 0;
++++++ ++++++}
++++++ ++++++
             static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
                                    struct ib_qp_init_attr *init_attr,
-------- ----                       struct ib_udata *udata, int sqpn, struct mlx4_ib_qp **caller_qp)
++++++++ ++++                       struct ib_udata *udata, int sqpn, struct mlx4_ib_qp **caller_qp,
++++++++ ++++                       gfp_t gfp)
             {
                int qpn;
                int err;

diff --cc drivers/net/ethernet/mellanox/mlx4/mlx4.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
Simple merge

diff --cc include/linux/mlx4/device.h
Simple merge

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