From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD484C433E0 for ; Fri, 3 Jul 2020 11:57:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A6C3620782 for ; Fri, 3 Jul 2020 11:57:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726082AbgGCL5T (ORCPT ); Fri, 3 Jul 2020 07:57:19 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:43562 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725984AbgGCL5T (ORCPT ); Fri, 3 Jul 2020 07:57:19 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: andrzej.p) with ESMTPSA id F1F462A63DE Subject: Re: [PATCH 0/3] Fixes for stop monitoring disabled devices series To: Daniel Lezcano , linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux-rockchip@lists.infradead.org Cc: "Rafael J . Wysocki" , Len Brown , Vishal Kulkarni , "David S . Miller" , Jiri Pirko , Ido Schimmel , Johannes Berg , Emmanuel Grumbach , Luca Coelho , Intel Linux Wireless , Kalle Valo , Peter Kaestle , Darren Hart , Andy Shevchenko , Sebastian Reichel , Miquel Raynal , Amit Kucheria , Support Opensource , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , =?UTF-8?Q?Niklas_S=c3=b6derlund?= , Heiko Stuebner , Orson Zhai , Baolin Wang , Chunyan Zhang , Zhang Rui , Allison Randal , Enrico Weigelt , Gayatri Kammela , Thomas Gleixner , Bartlomiej Zolnierkiewicz , kernel@collabora.com References: <20200703104354.19657-1-andrzej.p@collabora.com> From: Andrzej Pietrasiewicz Message-ID: <91db4c89-0615-4a69-9695-ed5d3c42e1b7@collabora.com> Date: Fri, 3 Jul 2020 13:57:12 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Hi, W dniu 03.07.2020 o 13:06, Daniel Lezcano pisze: > On 03/07/2020 12:43, Andrzej Pietrasiewicz wrote: >> This short series contains fixes for "Stop monitoring disabled devices" >> series https://www.spinics.net/lists/arm-kernel/msg817861.html >> >> Invocation of thermal_zone_device_is_enabled() in acpi/thermal is now >> redundant, because thermal_zone_device_update() now is capable of >> handling disabled devices. >> >> In imx's ->get_temp() the lock must not be taken, otherwise a deadlock >> happens. The decision whether explicitly running a measurement cycle >> is needed is taken based on driver's local irq_enabled variable. >> >> Finally, thermal_zone_device_is_enabled() is made available to the >> core only, as there are no driver users of it. >> >> Andrzej Pietrasiewicz (3): >> acpi: thermal: Don't call thermal_zone_device_is_enabled() >> thermal: imx: Use driver's local data to decide whether to run a >> measurement >> thermal: Make thermal_zone_device_is_enabled() available to core only >> >> drivers/acpi/thermal.c | 3 --- >> drivers/thermal/imx_thermal.c | 7 ++++--- >> drivers/thermal/thermal_core.c | 1 - >> drivers/thermal/thermal_core.h | 2 ++ >> include/linux/thermal.h | 5 ----- >> 5 files changed, 6 insertions(+), 12 deletions(-) > > Is this series easily merge-able with the other series? > So-so. Some simple conflicts needed to be resolved. I have created a branch for you to look at and decide how far off it is from the original and whether the original Acked-by/Reviewed-by can be retained. Note that I might have lost some portions of code during conflict resolution. It seems to me I haven't but you know. The branch: https://gitlab.collabora.com/andrzej.p/kernel-tests/-/tree/thermal-dont-poll-disabled-for-daniel The code compiles at each stage on x86_64 + COMPILE_TEST. Andrzej