linux-kernel - Re: linux-next: manual merge of the thermal tree with the pm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1a60d0b2-c020-4fce-d7f2-3534c9e14c84@intel.com>
Date:   Mon, 28 Nov 2022 13:51:53 +0100
From:   "Rafael J. Wysocki" <rafael.j.wysocki@...el.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Daniel Lezcano <daniel.lezcano@...aro.org>,
        Zhang Rui <rui.zhang@...el.com>,
        "Rafael J. Wysocki" <rjw@...ysocki.net>
CC:     Guenter Roeck <linux@...ck-us.net>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        <rafael@...nel.org>
Subject: Re: linux-next: manual merge of the thermal tree with the pm tree

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@...b.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