Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

Pull infiniband/rdma updates from Roland Dreier:
 "Main set of InfiniBand/RDMA updates for 3.17 merge window:

   - MR reregistration support
   - MAD support for RMPP in userspace
   - iSER and SRP initiator updates
   - ocrdma hardware driver updates
   - other fixes..."

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (52 commits)
  IB/srp: Fix return value check in srp_init_module()
  RDMA/ocrdma: report asic-id in query device
  RDMA/ocrdma: Update sli data structure for endianness
  RDMA/ocrdma: Obtain SL from device structure
  RDMA/uapi: Include socket.h in rdma_user_cm.h
  IB/srpt: Handle GID change events
  IB/mlx5: Use ARRAY_SIZE instead of sizeof/sizeof[0]
  IB/mlx4: Use ARRAY_SIZE instead of sizeof/sizeof[0]
  RDMA/amso1100: Check for integer overflow in c2_alloc_cq_buf()
  IPoIB: Remove unnecessary test for NULL before debugfs_remove()
  IB/mad: Add user space RMPP support
  IB/mad: add new ioctl to ABI to support new registration options
  IB/mad: Add dev_notice messages for various umad/mad registration failures
  IB/mad: Update module to [pr|dev]_* style print messages
  IB/ipoib: Avoid multicast join attempts with invalid P_key
  IB/umad: Update module to [pr|dev]_* style print messages
  IB/ipoib: Avoid flushing the workqueue from worker context
  IB/ipoib: Use P_Key change event instead of P_Key polling mechanism
  IB/ipath: Add P_Key change event support
  mlx4_core: Add support for secure-host and SMP firewall
  ...

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

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

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

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

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

diff --cc drivers/net/ethernet/emulex/benet/be.h
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

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

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

diff --cc drivers/scsi/scsi_transport_srp.c
Simple merge

diff --cc include/linux/mlx4/device.h
index e15b1544ea836716b7e6f9588ac1ecf9d486fc55,be4ab553a31727f532a657dbd472ff9462a00a10..071f6b234604cf770ebfab55e1ec61392e364a83
--- 1/include/linux/mlx4/device.h
--- 2/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@@ -1254,11 -1245,19 +1256,26 @@@ int mlx4_vf_smi_enabled(struct mlx4_de
  int mlx4_vf_get_enable_smi_admin(struct mlx4_dev *dev, int slave, int port);
  int mlx4_vf_set_enable_smi_admin(struct mlx4_dev *dev, int slave, int port,
                                 int enable);
+ int mlx4_mr_hw_get_mpt(struct mlx4_dev *dev, struct mlx4_mr *mmr,
+                      struct mlx4_mpt_entry ***mpt_entry);
+ int mlx4_mr_hw_write_mpt(struct mlx4_dev *dev, struct mlx4_mr *mmr,
+                        struct mlx4_mpt_entry **mpt_entry);
+ int mlx4_mr_hw_change_pd(struct mlx4_dev *dev, struct mlx4_mpt_entry *mpt_entry,
+                        u32 pdn);
+ int mlx4_mr_hw_change_access(struct mlx4_dev *dev,
+                            struct mlx4_mpt_entry *mpt_entry,
+                            u32 access);
+ void mlx4_mr_hw_put_mpt(struct mlx4_dev *dev,
+                       struct mlx4_mpt_entry **mpt_entry);
+ void mlx4_mr_rereg_mem_cleanup(struct mlx4_dev *dev, struct mlx4_mr *mr);
+ int mlx4_mr_rereg_mem_write(struct mlx4_dev *dev, struct mlx4_mr *mr,
+                           u64 iova, u64 size, int npages,
+                           int page_shift, struct mlx4_mpt_entry *mpt_entry);
 +
 +/* Returns true if running in low memory profile (kdump kernel) */
 +static inline bool mlx4_low_memory_profile(void)
 +{
 +      return reset_devices;
 +}
 +
  #endif /* MLX4_DEVICE_H */