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,
Srinivas Pandruvada <srinivas.pandruvada@linux•intel.com>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas•com>
Subject: linux-next: build failure after merge of the thermal-soc tree
Date: Thu, 31 Dec 2015 12:53:56 +1100 [thread overview]
Message-ID: <20151231125356.233ae279@canb.auug.org.au> (raw)
Hi Eduardo,
After merging the thermal-soc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/thermal/thermal_core.c: In function 'trip_point_temp_store':
drivers/thermal/thermal_core.c:764:2: error: too few arguments to function 'thermal_zone_device_update'
thermal_zone_device_update(tz);
^
drivers/thermal/thermal_core.c:612:6: note: declared here
void thermal_zone_device_update(struct thermal_zone_device *tz,
^
Caused by commit
ce0265dd6f8e ("thermal: trip_point_temp_store() calls thermal_zone_device_update()")
from the thermal-soc tree interacting with commit
c4117cc3526e ("thermal: core: enhance thermal_zone_device_update")
from the thermal tree.
I have applied the following merge fix patch for today:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Thu, 31 Dec 2015 12:47:22 +1100
Subject: [PATCH] thermal: fix for thermal_zone_device_update() API change
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/thermal/thermal_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index bd175218141f..7f7a3caf8892 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -761,7 +761,7 @@ trip_point_temp_store(struct device *dev, struct device_attribute *attr,
if (ret)
return ret;
- thermal_zone_device_update(tz);
+ thermal_zone_device_update(tz, THERMAL_DEVICE_EVENT_NONE);
return count;
}
--
2.6.4
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
next reply other threads:[~2015-12-31 1:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-31 1:53 Stephen Rothwell [this message]
2015-12-31 17:01 ` linux-next: build failure after merge of the thermal-soc tree Srinivas Pandruvada
-- strict thread matches above, loose matches on Subject: below --
2019-05-13 1:02 Stephen Rothwell
2019-05-13 15:57 ` Guenter Roeck
2015-11-05 5:01 Stephen Rothwell
2015-11-05 10:22 ` Caesar Wang
2015-11-09 19:17 ` Eduardo Valentin
2015-03-04 7:06 Stephen Rothwell
2015-03-04 19:01 ` Eduardo Valentin
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=20151231125356.233ae279@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=edubezval@gmail$(echo .)com \
--cc=kuninori.morimoto.gx@renesas$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rui.zhang@intel$(echo .)com \
--cc=srinivas.pandruvada@linux$(echo .)intel.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