Hi Eduardo,
Today's linux-next merge of the thermal-soc tree got a conflict in
include/linux/thermal.h between commit 33f1e05e1536 ("Thermal:
initialize thermal zone device correctly") from the thermal tree and
commit f7e41876c4b2 ("thermal: of: fix cooling device weights in device
tree") from the thermal-soc tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] diff --cc include/linux/thermal.h index 8650b0b14da4,6bbe11c97cea..000000000000 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@@ -40,9 -40,9 +40,12 @@@ /* No upper/lower limit requirement */ #define THERMAL_NO_LIMIT ((u32)~0) +/* Invalid/uninitialized temperature */ +#define THERMAL_TEMP_INVALID -27400 + + /* Default weight of a bound cooling device */ + #define THERMAL_WEIGHT_DEFAULT 0 + /* Unit conversion macros */ #define KELVIN_TO_CELSIUS(t) (long)(((long)t-2732 >= 0) ? \ ((long)t-2732+5)/10 : ((long)t-2732-5)/10)
pgpySq_svQ5AM.pgp
Description: OpenPGP digital signature
