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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2107 bytes --]

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 806 bytes --]

Hi all,

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

  drivers/thermal/intel/int340x_thermal/processor_thermal_device.c

between commit:

  8b4bd2566747 ("thermal/drivers/int340x: Do not set a wrong tcc offset on resume")

from Linus' tree and commit:

  fc26023f8816 ("thermal/drivers/int340x: Fix tcc offset on resume")

from the thermal tree.

I fixed it up (I just used the latter) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 812 bytes --]

Hi all,

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

  Documentation/driver-api/thermal/index.rst
  Documentation/driver-api/thermal/sysfs-api.rst
  Documentation/driver-api/thermal/x86_pkg_temperature_thermal.rst

between commit:

  eaf7b46083a7e34 ("docs: thermal: add it to the driver API")

from Linus' tree and commit:

  af3e0fe9c66370a ("docs: thermal: add it to the driver API")

from the thermal tree.

I fixed it up 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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Zhang Rui]

Hi, Stephen,

On Mon, 2012-11-05 at 11:46 +1100, Stephen Rothwell wrote:
> Hi Zhang,
> 
> Today's linux-next merge of the thermal tree got a conflict in
> drivers/thermal/rcar_thermal.c between commit 608f62b996c6 ("thermal:
> solve compilation errors in rcar_thermal") from Linus' tree and commit
> ebbf0f11e7b4 ("Thermal: Pass zone parameters as argument to
> tzd_register") from the thermal tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
I've rebased my -next branch on top of 3.7-rc4.
so please drop this fix.

thanks,
rui

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

[Zhang Rui]

On Mon, 2012-11-05 at 11:46 +1100, Stephen Rothwell wrote:
> Hi Zhang,
> 
> Today's linux-next merge of the thermal tree got a conflict in
> drivers/thermal/rcar_thermal.c between commit 608f62b996c6 ("thermal:
> solve compilation errors in rcar_thermal") from Linus' tree and commit
> ebbf0f11e7b4 ("Thermal: Pass zone parameters as argument to
> tzd_register") from the thermal tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
the fix looks good to me, Thanks!

-rui

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1076 bytes --]

Hi Zhang,

Today's linux-next merge of the thermal tree got a conflict in
drivers/thermal/rcar_thermal.c between commit 608f62b996c6 ("thermal:
solve compilation errors in rcar_thermal") from Linus' tree and commit
ebbf0f11e7b4 ("Thermal: Pass zone parameters as argument to
tzd_register") from the thermal tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/thermal/rcar_thermal.c
index f7a1b57,b13fe5d..0000000
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@@ -210,8 -210,8 +210,8 @@@ static int rcar_thermal_probe(struct pl
  		goto error_free_priv;
  	}
  
 -	zone = thermal_zone_device_register("rcar_thermal", 0, priv,
 +	zone = thermal_zone_device_register("rcar_thermal", 0, 0, priv,
- 					    &rcar_thermal_zone_ops, 0, 0);
+ 				    &rcar_thermal_zone_ops, NULL, 0, 0);
  	if (IS_ERR(zone)) {
  		dev_err(&pdev->dev, "thermal zone device is NULL\n");
  		ret = PTR_ERR(zone);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]