Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <9ac3a182-fc30-0834-8555-a4ec334531ae@linaro.org>
Date:   Mon, 28 Nov 2022 14:22:27 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.4.2
Subject: Re: linux-next: manual merge of the thermal tree with the pm tree
Content-Language: en-US
To:     "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        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
References: <20221117122904.6759427e@canb.auug.org.au>
 <20221128102212.39f90b0c@canb.auug.org.au>
 <1a60d0b2-c020-4fce-d7f2-3534c9e14c84@intel.com>
From:   Daniel Lezcano <daniel.lezcano@linaro.org>
In-Reply-To: <1a60d0b2-c020-4fce-d7f2-3534c9e14c84@intel.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk


Hi,

On 28/11/2022 13:51, Rafael J. Wysocki wrote:
> 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?

Yes sorry for that, I'll go back in a couple of days and sort this out


-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog