linux-next: manual merge of the thermal tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the thermal tree got a conflict in:

  drivers/net/ethernet/mellanox/mlxsw/core_thermal.c

between commits:

  03978fb88b06 ("mlxsw: core_thermal: Use common define for thermal zone name length")
  ef0df4fa324a ("mlxsw: core_thermal: Extend internal structures to support multi thermal areas")

from Linus' tree and commit:

  9b5e2c897cd1 ("Revert "mlxsw: core: Add the hottest thermal zone detection"")

from the thermal tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
index 3548fe1df7c8,373a77c3da02..000000000000
--- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
@@@ -21,7 -21,7 +21,6 @@@
  #define MLXSW_THERMAL_ASIC_TEMP_HOT	105000	/* 105C */
  #define MLXSW_THERMAL_HYSTERESIS_TEMP	5000	/* 5C */
  #define MLXSW_THERMAL_MODULE_TEMP_SHIFT	(MLXSW_THERMAL_HYSTERESIS_TEMP * 2)
- #define MLXSW_THERMAL_TEMP_SCORE_MAX	GENMASK(31, 0)
 -#define MLXSW_THERMAL_ZONE_MAX_NAME	16
  #define MLXSW_THERMAL_MAX_STATE	10
  #define MLXSW_THERMAL_MIN_STATE	2
  #define MLXSW_THERMAL_MAX_DUTY	255
@@@ -101,9 -91,10 +100,7 @@@ struct mlxsw_thermal 
  	struct thermal_cooling_device *cdevs[MLXSW_MFCR_PWMS_MAX];
  	u8 cooling_levels[MLXSW_THERMAL_MAX_STATE + 1];
  	struct mlxsw_thermal_trip trips[MLXSW_THERMAL_NUM_TRIPS];
- 	unsigned int tz_highest_score;
- 	struct thermal_zone_device *tz_highest_dev;
 -	struct mlxsw_thermal_module *tz_module_arr;
 -	u8 tz_module_num;
 -	struct mlxsw_thermal_module *tz_gearbox_arr;
 -	u8 tz_gearbox_num;
 +	struct mlxsw_thermal_area line_cards[];
  };
  
  static inline u8 mlxsw_state_to_duty(int state)

Attachment: pgpzK7rH1Vkaz.pgp
Description: OpenPGP digital signature