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@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx> --- 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@xxxxxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html