From: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
To: Daniel Lezcano <daniel.lezcano@linaro.org>,
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" <rjw@rjwysocki.net>,
"Len Brown" <lenb@kernel.org>,
"Vishal Kulkarni" <vishal@chelsio.com>,
"David S . Miller" <davem@davemloft.net>,
"Jiri Pirko" <jiri@mellanox.com>,
"Ido Schimmel" <idosch@mellanox.com>,
"Johannes Berg" <johannes.berg@intel.com>,
"Emmanuel Grumbach" <emmanuel.grumbach@intel.com>,
"Luca Coelho" <luciano.coelho@intel.com>,
"Intel Linux Wireless" <linuxwifi@intel.com>,
"Kalle Valo" <kvalo@codeaurora.org>,
"Peter Kaestle" <peter@piie.net>,
"Darren Hart" <dvhart@infradead.org>,
"Andy Shevchenko" <andy@infradead.org>,
"Sebastian Reichel" <sre@kernel.org>,
"Miquel Raynal" <miquel.raynal@bootlin.com>,
"Amit Kucheria" <amit.kucheria@verdurent.com>,
"Support Opensource" <support.opensource@diasemi.com>,
"Shawn Guo" <shawnguo@kernel.org>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"Pengutronix Kernel Team" <kernel@pengutronix.de>,
"Fabio Estevam" <festevam@gmail.com>,
"NXP Linux Team" <linux-imx@nxp.com>,
"Niklas Söderlund" <niklas.soderlund@ragnatech.se>,
"Heiko Stuebner" <heiko@sntech.de>,
"Orson Zhai" <orsonzhai@gmail.com>,
"Baolin Wang" <baolin.wang7@gmail.com>,
"Chunyan Zhang" <zhang.lyra@gmail.com>,
"Zhang Rui" <rui.zhang@intel.com>,
"Allison Randal" <allison@lohutok.net>,
"Enrico Weigelt" <info@metux.net>,
"Gayatri Kammela" <gayatri.kammela@intel.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Bartlomiej Zolnierkiewicz" <b.zolnierkie@samsung.com>,
kernel@collabora.com
Subject: Re: [PATCH 0/3] Fixes for stop monitoring disabled devices series
Date: Fri, 3 Jul 2020 13:57:12 +0200 [thread overview]
Message-ID: <91db4c89-0615-4a69-9695-ed5d3c42e1b7@collabora.com> (raw)
In-Reply-To: <fc1bb7f5-2096-a604-8c30-81d34bf5b737@linaro.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
next prev parent reply other threads:[~2020-07-03 11:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-03 10:43 [PATCH 0/3] Fixes for stop monitoring disabled devices series Andrzej Pietrasiewicz
2020-07-03 10:43 ` [PATCH 1/3] acpi: thermal: Don't call thermal_zone_device_is_enabled() Andrzej Pietrasiewicz
2020-07-03 10:43 ` [PATCH 2/3] thermal: imx: Use driver's local data to decide whether to run a measurement Andrzej Pietrasiewicz
2020-07-03 10:43 ` [PATCH 3/3] thermal: Make thermal_zone_device_is_enabled() available to core only Andrzej Pietrasiewicz
2020-07-03 11:06 ` [PATCH 0/3] Fixes for stop monitoring disabled devices series Daniel Lezcano
2020-07-03 11:57 ` Andrzej Pietrasiewicz [this message]
2020-07-03 12:05 ` Daniel Lezcano
2020-07-05 6:04 ` Zhang Rui
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=91db4c89-0615-4a69-9695-ed5d3c42e1b7@collabora.com \
--to=andrzej.p@collabora.com \
--cc=allison@lohutok.net \
--cc=amit.kucheria@verdurent.com \
--cc=andy@infradead.org \
--cc=b.zolnierkie@samsung.com \
--cc=baolin.wang7@gmail.com \
--cc=daniel.lezcano@linaro.org \
--cc=davem@davemloft.net \
--cc=dvhart@infradead.org \
--cc=emmanuel.grumbach@intel.com \
--cc=festevam@gmail.com \
--cc=gayatri.kammela@intel.com \
--cc=heiko@sntech.de \
--cc=idosch@mellanox.com \
--cc=info@metux.net \
--cc=jiri@mellanox.com \
--cc=johannes.berg@intel.com \
--cc=kernel@collabora.com \
--cc=kernel@pengutronix.de \
--cc=kvalo@codeaurora.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-pm@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linuxwifi@intel.com \
--cc=luciano.coelho@intel.com \
--cc=miquel.raynal@bootlin.com \
--cc=netdev@vger.kernel.org \
--cc=niklas.soderlund@ragnatech.se \
--cc=orsonzhai@gmail.com \
--cc=peter@piie.net \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=rui.zhang@intel.com \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=sre@kernel.org \
--cc=support.opensource@diasemi.com \
--cc=tglx@linutronix.de \
--cc=vishal@chelsio.com \
--cc=zhang.lyra@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).