Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infin...

diff --combined drivers/infiniband/hw/mlx5/main.c
index bf900579ac08b4cae5ac09320b5189727b292485,7b9c0782105eeb0ed0c80092da8e2d429bf886ba..fa6dc870adae54cafd2e3925aaf9359b396942b4
--- 1/drivers/infiniband/hw/mlx5/main.c
--- 2/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@@ -46,8 -46,8 +46,8 @@@
  #include "mlx5_ib.h"
  
  #define DRIVER_NAME "mlx5_ib"
 -#define DRIVER_VERSION "1.0"
 -#define DRIVER_RELDATE        "June 2013"
 +#define DRIVER_VERSION "2.2-1"
 +#define DRIVER_RELDATE        "Feb 2014"
  
  MODULE_AUTHOR("Eli Cohen <eli@mellanox.com>");
  MODULE_DESCRIPTION("Mellanox Connect-IB HCA IB driver");
@@@ -273,6 -273,15 +273,15 @@@ static int mlx5_ib_query_device(struct 
        if (flags & MLX5_DEV_CAP_FLAG_XRC)
                props->device_cap_flags |= IB_DEVICE_XRC;
        props->device_cap_flags |= IB_DEVICE_MEM_MGT_EXTENSIONS;
+       if (flags & MLX5_DEV_CAP_FLAG_SIG_HAND_OVER) {
+               props->device_cap_flags |= IB_DEVICE_SIGNATURE_HANDOVER;
+               /* At this stage no support for signature handover */
+               props->sig_prot_cap = IB_PROT_T10DIF_TYPE_1 |
+                                     IB_PROT_T10DIF_TYPE_2 |
+                                     IB_PROT_T10DIF_TYPE_3;
+               props->sig_guard_cap = IB_GUARD_T10DIF_CRC |
+                                      IB_GUARD_T10DIF_CSUM;
+       }
  
        props->vendor_id           = be32_to_cpup((__be32 *)(out_mad->data + 36)) &
                0xffffff;
@@@ -1423,12 -1432,15 +1432,15 @@@ static int init_one(struct pci_dev *pde
        dev->ib_dev.get_dma_mr          = mlx5_ib_get_dma_mr;
        dev->ib_dev.reg_user_mr         = mlx5_ib_reg_user_mr;
        dev->ib_dev.dereg_mr            = mlx5_ib_dereg_mr;
+       dev->ib_dev.destroy_mr          = mlx5_ib_destroy_mr;
        dev->ib_dev.attach_mcast        = mlx5_ib_mcg_attach;
        dev->ib_dev.detach_mcast        = mlx5_ib_mcg_detach;
        dev->ib_dev.process_mad         = mlx5_ib_process_mad;
+       dev->ib_dev.create_mr           = mlx5_ib_create_mr;
        dev->ib_dev.alloc_fast_reg_mr   = mlx5_ib_alloc_fast_reg_mr;
        dev->ib_dev.alloc_fast_reg_page_list = mlx5_ib_alloc_fast_reg_page_list;
        dev->ib_dev.free_fast_reg_page_list  = mlx5_ib_free_fast_reg_page_list;
+       dev->ib_dev.check_mr_status     = mlx5_ib_check_mr_status;
  
        if (mdev->caps.flags & MLX5_DEV_CAP_FLAG_XRC) {
                dev->ib_dev.alloc_xrcd = mlx5_ib_alloc_xrcd;

diff --combined drivers/net/ethernet/mellanox/mlx5/core/main.c
index 23b7e2d35a93bb0598ac76b71d75cfc3ea7afff8,96a0617f7609598a5251757eaf9a823550691e26..9ca2aaa05e9c7142fa2f616ff5db65094ed74c6b
--- 1/drivers/net/ethernet/mellanox/mlx5/core/main.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@@ -46,8 -46,8 +46,8 @@@
  #include "mlx5_core.h"
  
  #define DRIVER_NAME "mlx5_core"
 -#define DRIVER_VERSION "1.0"
 -#define DRIVER_RELDATE        "June 2013"
 +#define DRIVER_VERSION "2.2-1"
 +#define DRIVER_RELDATE        "Feb 2014"
  
  MODULE_AUTHOR("Eli Cohen <eli@mellanox.com>");
  MODULE_DESCRIPTION("Mellanox ConnectX-IB HCA core library");
@@@ -446,6 -446,7 +446,7 @@@ int mlx5_dev_init(struct mlx5_core_dev 
        mlx5_init_cq_table(dev);
        mlx5_init_qp_table(dev);
        mlx5_init_srq_table(dev);
+       mlx5_init_mr_table(dev);
  
        return 0;