Merge remote-tracking branch 'infiniband/for-next'

Conflicts:
	include/linux/mlx4/device.h

diff --cc MAINTAINERS
Simple merge

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

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

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

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

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

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

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

diff --cc include/linux/mlx4/cq.h
index 5dd0d70a06895b49e1d83db28968d0ebfdb179e0,e1862997f933ce7cc1c5d46d817e6f587d25222d..e7ecc12a11636f1afe2f591e019da293ed1f517a
--- 1/include/linux/mlx4/cq.h
--- 2/include/linux/mlx4/cq.h
+++ b/include/linux/mlx4/cq.h
@@@ -81,13 -87,9 +87,14 @@@ struct mlx4_ts_cqe 
  } __packed;
  
  enum {
 +      MLX4_CQE_L2_TUNNEL_IPOK         = 1 << 31,
        MLX4_CQE_VLAN_PRESENT_MASK      = 1 << 29,
 +      MLX4_CQE_L2_TUNNEL              = 1 << 27,
 +      MLX4_CQE_L2_TUNNEL_CSUM         = 1 << 26,
 +      MLX4_CQE_L2_TUNNEL_IPV4         = 1 << 25,
 +
        MLX4_CQE_QPN_MASK               = 0xffffff,
+       MLX4_CQE_VID_MASK               = 0xfff,
  };
  
  enum {

diff --cc include/linux/mlx4/device.h
index c99ecf6d2c675f53dc127058638ea5f9d501cb8d,ac5cb1d92487c4dc5b1512999a719bd34ab927f7..fdd70ead3cdaa01c6b0e6ef97ca7f6b1ac091658
--- 1/include/linux/mlx4/device.h
--- 2/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@@ -166,7 -161,7 +166,8 @@@ enum 
        MLX4_DEV_CAP_FLAG2_VLAN_CONTROL         = 1LL <<  6,
        MLX4_DEV_CAP_FLAG2_FSM                  = 1LL <<  7,
        MLX4_DEV_CAP_FLAG2_UPDATE_QP            = 1LL <<  8,
-       MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS       = 1LL <<  9
 -      MLX4_DEV_CAP_FLAG2_DMFS_IPOIB           = 1LL <<  9
++      MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS       = 1LL <<  9,
++      MLX4_DEV_CAP_FLAG2_DMFS_IPOIB           = 1LL <<  10
  };
  
  enum {
@@@ -1130,7 -1096,7 +1131,8 @@@ int mlx4_SET_PORT_qpn_calc(struct mlx4_
  int mlx4_SET_PORT_PRIO2TC(struct mlx4_dev *dev, u8 port, u8 *prio2tc);
  int mlx4_SET_PORT_SCHEDULER(struct mlx4_dev *dev, u8 port, u8 *tc_tx_bw,
                u8 *pg, u16 *ratelimit);
 +int mlx4_SET_PORT_VXLAN(struct mlx4_dev *dev, u8 port, u8 steering);
+ int mlx4_find_cached_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *idx);
  int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx);
  int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index);
  void mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, u16 vlan);