On 03/07/2020 13:57, Andrzej Pietrasiewicz wrote: > 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 Ok, I propose to keep the these three patches on top of V7. Rui are you fine with that ? -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
