Merge branches 'misc' and 'mlx4' into for-next

Conflicts:
	drivers/infiniband/hw/mlx4/main.c
	drivers/net/ethernet/mellanox/mlx4/main.c
	include/linux/mlx4/device.h

1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
index c34d30a5d77b..a99a13e9e695 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@ -363,6 +363,10 @@ struct mlx4_eqe {
                 struct {
                         __be32  slave_id;
                 } __packed flr_event;
+                struct {
+                        __be16  current_temperature;
+                        __be16  warning_threshold;
+                } __packed warming;
         }                       event;
         u8                      slave_id;
         u8                      reserved3[2];
@@ -399,7 +403,7 @@ struct mlx4_profile {
         int                     num_cq;
         int                     num_mcg;
         int                     num_mpt;
-        int                     num_mtt;
+        unsigned                num_mtt;
 };
 
 struct mlx4_fw {
@@ -682,6 +686,8 @@ struct mlx4_port_info {
         char                    dev_name[16];
         struct device_attribute port_attr;
         enum mlx4_port_type     tmp_type;
+        char                    dev_mtu_name[16];
+        struct device_attribute port_mtu_attr;
         struct mlx4_mac_table   mac_table;
         struct radix_tree_root  mac_tree;
         struct mlx4_vlan_table  vlan_table;