linux-next: manual merge of the thermal tree with the pm tree

[Stephen Rothwell]

Hi all,

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

  drivers/thermal/thermal_core.c
  drivers/thermal/thermal_core.h

between commit:

  a8c959402d4d ("thermal: core: Add governor callback for thermal zone change")

from the pm tree and commits:

  726edaad90f6 ("thermal/core: Prepare for introduction of thermal reboot")
  f21b0d185f75 ("reboot: Introduce thermal_zone_device_critical_reboot()")

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/thermal/thermal_core.c
index 58958288b559,9d47347d4242..000000000000
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@@ -309,16 -314,7 +309,16 @@@ static void handle_non_critical_trips(s
  		       def_governor->throttle(tz, trip);
  }
  
 +void thermal_governor_update_tz(struct thermal_zone_device *tz,
 +				enum thermal_notify_event reason)
 +{
 +	if (!tz->governor || !tz->governor->update_tz)
 +		return;
 +
 +	tz->governor->update_tz(tz, reason);
 +}
 +
- void thermal_zone_device_critical(struct thermal_zone_device *tz)
+ static void thermal_zone_device_halt(struct thermal_zone_device *tz, bool shutdown)
  {
  	/*
  	 * poweroff_delay_ms must be a carefully profiled positive value.
diff --cc drivers/thermal/thermal_core.h
index 479c3b6917e4,36364688b4a2..000000000000
--- a/drivers/thermal/thermal_core.h
+++ b/drivers/thermal/thermal_core.h
@@@ -114,8 -114,7 +114,9 @@@ int thermal_zone_device_set_policy(stru
  int thermal_build_list_of_policies(char *buf);
  void __thermal_zone_device_update(struct thermal_zone_device *tz,
  				  enum thermal_notify_event event);
 +void thermal_governor_update_tz(struct thermal_zone_device *tz,
 +				enum thermal_notify_event reason);
+ void thermal_zone_device_critical_reboot(struct thermal_zone_device *tz);
  
  /* Helpers */
  #define for_each_trip(__tz, __trip)	\

Attachment: pgpCduG9E_O8W.pgp
Description: OpenPGP digital signature