From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Lezcano <daniel.lezcano@linaro•org>,
Zhang Rui <rui.zhang@intel•com>,
"Rafael J. Wysocki" <rjw@rjwysocki•net>
Cc: Fabio Estevam <festevam@denx•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Lukasz Luba <lukasz.luba@arm•com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel•com>
Subject: linux-next: manual merge of the thermal tree with the pm tree
Date: Tue, 2 Jan 2024 10:09:17 +1100 [thread overview]
Message-ID: <20240102100917.223cd3b7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2280 bytes --]
Hi all,
Today's linux-next merge of the thermal tree got conflicts in:
drivers/thermal/thermal_core.c
drivers/thermal/thermal_core.h
between commit:
a8c959402d4d ("thermal: core: Add governor callback for thermal zone change")
from the pm tree and commits:
726edaad90f6 ("thermal/core: Prepare for introduction of thermal reboot")
f21b0d185f75 ("reboot: Introduce thermal_zone_device_critical_reboot()")
from the thermal tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/thermal/thermal_core.c
index 58958288b559,9d47347d4242..000000000000
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@@ -309,16 -314,7 +309,16 @@@ static void handle_non_critical_trips(s
def_governor->throttle(tz, trip);
}
+void thermal_governor_update_tz(struct thermal_zone_device *tz,
+ enum thermal_notify_event reason)
+{
+ if (!tz->governor || !tz->governor->update_tz)
+ return;
+
+ tz->governor->update_tz(tz, reason);
+}
+
- void thermal_zone_device_critical(struct thermal_zone_device *tz)
+ static void thermal_zone_device_halt(struct thermal_zone_device *tz, bool shutdown)
{
/*
* poweroff_delay_ms must be a carefully profiled positive value.
diff --cc drivers/thermal/thermal_core.h
index 479c3b6917e4,36364688b4a2..000000000000
--- a/drivers/thermal/thermal_core.h
+++ b/drivers/thermal/thermal_core.h
@@@ -114,8 -114,7 +114,9 @@@ int thermal_zone_device_set_policy(stru
int thermal_build_list_of_policies(char *buf);
void __thermal_zone_device_update(struct thermal_zone_device *tz,
enum thermal_notify_event event);
+void thermal_governor_update_tz(struct thermal_zone_device *tz,
+ enum thermal_notify_event reason);
+ void thermal_zone_device_critical_reboot(struct thermal_zone_device *tz);
/* Helpers */
#define for_each_trip(__tz, __trip) \
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-01-01 23:09 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-01 23:09 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-26 16:45 linux-next: manual merge of the thermal tree with the pm tree Mark Brown
2026-01-27 19:39 ` Wysocki, Rafael J
2023-04-06 0:32 Stephen Rothwell
2023-01-24 22:45 Stephen Rothwell
2023-01-25 11:57 ` Wysocki, Rafael J
2023-01-24 22:39 Stephen Rothwell
2023-01-25 11:57 ` Wysocki, Rafael J
2023-01-04 23:10 Stephen Rothwell
2023-01-04 23:35 ` Stephen Rothwell
2023-01-05 14:27 ` Wysocki, Rafael J
2023-01-05 15:30 ` Daniel Lezcano
2023-01-05 20:13 ` Wysocki, Rafael J
2023-01-04 23:03 Stephen Rothwell
2022-11-17 1:29 Stephen Rothwell
2022-11-17 16:18 ` Rafael J. Wysocki
2022-11-27 23:22 ` Stephen Rothwell
2022-11-28 12:51 ` Rafael J. Wysocki
2022-11-28 13:22 ` Daniel Lezcano
2022-11-28 13:48 ` Bagas Sanjaya
2022-11-28 13:54 ` Rafael J. Wysocki
2022-11-28 13:56 ` Daniel Lezcano
2022-11-29 14:32 ` Geert Uytterhoeven
2014-10-10 1:10 Stephen Rothwell
2014-10-10 8:40 ` Zhang Rui
2014-01-06 3:14 Stephen Rothwell
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=20240102100917.223cd3b7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=daniel.lezcano@linaro$(echo .)org \
--cc=festevam@denx$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lukasz.luba@arm$(echo .)com \
--cc=rafael.j.wysocki@intel$(echo .)com \
--cc=rjw@rjwysocki$(echo .)net \
--cc=rui.zhang@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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