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

Pull infiniband update from Roland Dreier:
 "Main batch of InfiniBand/RDMA changes for 3.9:

   - SRP error handling fixes from Bart Van Assche

   - Implementation of memory windows for mlx4 from Shani Michaeli

   - Lots of cxgb4 HW driver fixes from Vipul Pandya

   - Make iSER work for virtual functions, other fixes from Or Gerlitz

   - Fix for bug in qib HW driver from Mike Marciniszyn

   - IPoIB fixes from me, Itai Garbi, Shlomo Pongratz, Yan Burman

   - Various cleanups and warning fixes from Julia Lawall, Paul Bolle,
     Wei Yongjun"

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (41 commits)
  IB/mlx4: Advertise MW support
  IB/mlx4: Support memory window binding
  mlx4: Implement memory windows allocation and deallocation
  mlx4_core: Enable memory windows in {INIT, QUERY}_HCA
  mlx4_core: Disable memory windows for virtual functions
  IPoIB: Free ipoib neigh on path record failure so path rec queries are retried
  IB/srp: Fail I/O requests if the transport is offline
  IB/srp: Avoid endless SCSI error handling loop
  IB/srp: Avoid sending a task management function needlessly
  IB/srp: Track connection state properly
  IB/mlx4: Remove redundant NULL check before kfree
  IB/mlx4: Fix compiler warning about uninitialized 'vlan' variable
  IB/mlx4: Convert is_xxx variables in build_mlx_header() to bool
  IB/iser: Enable iser when FMRs are not supported
  IB/iser: Avoid error prints on EAGAIN registration failures
  IB/iser: Use proper define for the commands per LUN value advertised to SCSI ML
  IB/uverbs: Implement memory windows support in uverbs
  IB/core: Add "type 2" memory windows support
  mlx4_core: Propagate MR deregistration failures to caller
  mlx4_core: Rename MPT-related functions to have mpt_ prefix
  ...

diff --cc drivers/infiniband/hw/cxgb3/iwch_provider.c
Simple merge

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

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

diff --cc drivers/net/ethernet/mellanox/mlx4/fw.h
index 3af33ff669cca2fc3b500607f34ef4bc10ff9595,9f1a25ca002c02b2736cdab3e799c6fae3b2d2b1..151c2bb380a60466443bcf7bb2ee6adc4be48ecc
--- 1/drivers/net/ethernet/mellanox/mlx4/fw.h
--- 2/drivers/net/ethernet/mellanox/mlx4/fw.h
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.h
@@@ -170,7 -170,9 +170,8 @@@ struct mlx4_init_hca_param 
        u8  log_mc_table_sz;
        u8  log_mpt_sz;
        u8  log_uar_sz;
+       u8  mw_enabled;  /* Enable memory windows */
        u8  uar_page_sz; /* log pg sz in 4k chunks */
 -      u8  fs_hash_enable_bits;
        u8  steering_mode; /* for QUERY_HCA */
        u64 dev_cap_enabled;
  };

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

diff --cc drivers/net/ethernet/mellanox/mlx4/mlx4.h
index ed4a6959e828e9b2ee1163de9d644df72876887a,8b75d5ef0940b9758cea7d1ec1235867d990276f..cf883345af8887eeac97eb5b7278b98a98ffe4bb
--- 1/drivers/net/ethernet/mellanox/mlx4/mlx4.h
--- 2/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@@ -60,6 -60,13 +60,8 @@@
  #define MLX4_FS_MGM_LOG_ENTRY_SIZE    7
  #define MLX4_FS_NUM_MCG                       (1 << 17)
  
 -enum {
 -      MLX4_FS_L2_HASH = 0,
 -      MLX4_FS_L2_L3_L4_HASH,
 -};
 -
+ #define INIT_HCA_TPT_MW_ENABLE          (1 << 7)
+ 
  #define MLX4_NUM_UP           8
  #define MLX4_NUM_TC           8
  #define MLX4_RATELIMIT_UNITS 3 /* 100 Mbps */

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

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