Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iboe', 'ipoib', 'misc...

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/infiniband/hw/mlx4/main.c
index 4e94e360e43b42ed1f31685bdcb8b7387bc1b46e,4e94e360e43b42ed1f31685bdcb8b7387bc1b46e,4e94e360e43b42ed1f31685bdcb8b7387bc1b46e,4e94e360e43b42ed1f31685bdcb8b7387bc1b46e,4e94e360e43b42ed1f31685bdcb8b7387bc1b46e,8736bd836dc014f5170bbd86a905900647344791,4e94e360e43b42ed1f31685bdcb8b7387bc1b46e,4e94e360e43b42ed1f31685bdcb8b7387bc1b46e,ac6951d993368e327aa23ffdfad6a627eeefc922,4e94e360e43b42ed1f31685bdcb8b7387bc1b46e,4e94e360e43b42ed1f31685bdcb8b7387bc1b46e,4e94e360e43b42ed1f31685bdcb8b7387bc1b46e..bf3e20cd029859f2beb23e962fa2640e30faf44c
--- 1/drivers/infiniband/hw/mlx4/main.c
--- 2/drivers/infiniband/hw/mlx4/main.c
--- 3/drivers/infiniband/hw/mlx4/main.c
--- 4/drivers/infiniband/hw/mlx4/main.c
--- 5/drivers/infiniband/hw/mlx4/main.c
--- 6/drivers/infiniband/hw/mlx4/main.c
--- 7/drivers/infiniband/hw/mlx4/main.c
--- 8/drivers/infiniband/hw/mlx4/main.c
--- 9/drivers/infiniband/hw/mlx4/main.c
--- 10/drivers/infiniband/hw/mlx4/main.c
--- 11/drivers/infiniband/hw/mlx4/main.c
--- 12/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@@@@@@@@@@@@ -154,28 -154,28 -154,28 -154,28 -154,28 -170,19 -154,28 -154,28 -154,28 -154,28 -154,28 -154,28 +170,19 @@@@@@@@@@@@@ out
                return err;
            }
            
----- ------static int mlx4_ib_query_port(struct ib_device *ibdev, u8 port,
----- ------                          struct ib_port_attr *props)
+++++ ++++++static enum rdma_link_layer
+++++ ++++++mlx4_ib_port_link_layer(struct ib_device *device, u8 port_num)
            {
----- ------    struct ib_smp *in_mad  = NULL;
----- ------    struct ib_smp *out_mad = NULL;
----- ------    int err = -ENOMEM;
----- -- ---
----- -- ---    in_mad  = kzalloc(sizeof *in_mad, GFP_KERNEL);
----- -- ---    out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
----- -- ---    if (!in_mad || !out_mad)
----- -- ---            goto out;
----- -- ---
----- -- ---    memset(props, 0, sizeof *props);
----- -- ---
----- -- ---    init_query_mad(in_mad);
----- -- ---    in_mad->attr_id  = IB_SMP_ATTR_PORT_INFO;
----- -- ---    in_mad->attr_mod = cpu_to_be32(port);
+++++ ++++++    struct mlx4_dev *dev = to_mdev(device)->dev;
            
        -       in_mad  = kzalloc(sizeof *in_mad, GFP_KERNEL);
        -       out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
        -       if (!in_mad || !out_mad)
        -               goto out;
        -   
        -       memset(props, 0, sizeof *props);
        -   
        -       init_query_mad(in_mad);
        -       in_mad->attr_id  = IB_SMP_ATTR_PORT_INFO;
        -       in_mad->attr_mod = cpu_to_be32(port);
        -   
----- ------    err = mlx4_MAD_IFC(to_mdev(ibdev), 1, 1, port, NULL, NULL, in_mad, out_mad);
----- ------    if (err)
----- ------            goto out;
+++++ ++++++    return dev->caps.port_mask & (1 << (port_num - 1)) ?
+++++ ++++++            IB_LINK_LAYER_INFINIBAND : IB_LINK_LAYER_ETHERNET;
+++++ ++++++}
            
+++++ ++++++static int ib_link_query_port(struct ib_device *ibdev, u8 port,
+++++ ++++++                          struct ib_port_attr *props,
+++++ ++++++                          struct ib_smp *out_mad)
+++++ ++++++{
                props->lid              = be16_to_cpup((__be16 *) (out_mad->data + 16));
                props->lmc              = out_mad->data[34] & 0x7;
                props->sm_lid           = be16_to_cpup((__be16 *) (out_mad->data + 18));

diff --cc drivers/infiniband/ulp/ipoib/ipoib_main.c
Simple merge

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

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