From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
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@kernel.org>
Subject: Re: linux-next: manual merge of the thermal tree with the pm tree
Date: Mon, 28 Nov 2022 13:51:53 +0100 [thread overview]
Message-ID: <1a60d0b2-c020-4fce-d7f2-3534c9e14c84@intel.com> (raw)
In-Reply-To: <20221128102212.39f90b0c@canb.auug.org.au>
Hi Stephen,
On 11/28/2022 12:22 AM, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 17 Nov 2022 12:29:04 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> 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.
> I am still not merging the thermal tree ...
>
Sorry about this, but I cannot fix it myself and Daniel is on an
extended leave.
Can you just drop it permanently from linux-next and we'll sort this out
when Daniel is back?
Thanks,
Rafael
next prev parent reply other threads:[~2022-11-28 12:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-17 1:29 linux-next: manual merge of the thermal tree with the pm tree 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 [this message]
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 --
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=1a60d0b2-c020-4fce-d7f2-3534c9e14c84@intel.com \
--to=rafael.j.wysocki@intel.com \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=rafael@kernel.org \
--cc=rjw@rjwysocki.net \
--cc=rui.zhang@intel.com \
--cc=sfr@canb.auug.org.au \
/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).