From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754475AbbLaByH (ORCPT ); Wed, 30 Dec 2015 20:54:07 -0500 Received: from ozlabs.org ([103.22.144.67]:37158 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752028AbbLaByE (ORCPT ); Wed, 30 Dec 2015 20:54:04 -0500 Date: Thu, 31 Dec 2015 12:53:56 +1100 From: Stephen Rothwell To: Eduardo Valentin , Zhang Rui Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Pandruvada , Kuninori Morimoto Subject: linux-next: build failure after merge of the thermal-soc tree Message-ID: <20151231125356.233ae279@canb.auug.org.au> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 --- 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