From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Eduardo Valentin <edubezval@gmail•com>, Zhang Rui <rui.zhang@intel•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Kapileshwar Singh <kapileshwar.singh@arm•com>
Subject: linux-next: manual merge of the thermal-soc tree with the thermal tree
Date: Tue, 24 Mar 2015 13:11:25 +1100 [thread overview]
Message-ID: <20150324131125.309811e1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1068 bytes --]
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 sfr@canb•auug.org.au
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)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-03-24 2:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-24 2:11 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-07-04 2:55 linux-next: manual merge of the thermal-soc tree with the thermal tree Stephen Rothwell
2016-08-04 1:29 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150324131125.309811e1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=edubezval@gmail$(echo .)com \
--cc=kapileshwar.singh@arm$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rui.zhang@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox