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: Guenter Roeck <linux@roeck-us•net>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel•com>
Subject: linux-next: manual merge of the thermal tree with the pm tree
Date: Thu, 17 Nov 2022 12:29:04 +1100 [thread overview]
Message-ID: <20221117122904.6759427e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 641 bytes --]
Hi all,
Today's linux-next merge of the thermal tree got a conflict in:
drivers/thermal/thermal_sysfs.c
between commit:
05eeee2b51b4 ("thermal/core: Protect sysfs accesses to thermal operations with thermal zone mutex")
from the pm tree and commits:
dca20ad5acb7 ("thermal/core: Add a generic thermal_zone_get_trip() function")
aed8b46d141c ("thermal/core: Add a generic thermal_zone_set_trip() function")
from the thermal tree.
This was just too painful to fix up, so please fix it yourselves or
supply me with a resolution.
I have dropped the thermal tree for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-11-17 1:29 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-17 1:29 Stephen Rothwell [this message]
2022-11-17 16:18 ` linux-next: manual merge of the thermal tree with the pm tree 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
-- strict thread matches above, loose matches on Subject: below --
2026-01-26 16:45 Mark Brown
2026-01-27 19:39 ` Wysocki, Rafael J
2024-01-01 23:09 Stephen Rothwell
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
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=20221117122904.6759427e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=daniel.lezcano@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@roeck-us$(echo .)net \
--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