linux-kernel - Re: [GIT PULL] thermal for v6.4-rc1

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: <c230ab3a-9cc3-e989-1e49-7d38be471a5c@linaro.org>
Date:   Wed, 5 Apr 2023 21:03:35 +0200
From:   Daniel Lezcano <daniel.lezcano@...aro.org>
To:     "Rafael J. Wysocki" <rafael@...nel.org>
Cc:     "Rafael J. Wysocki" <rjw@...ysocki.net>,
        Zhang Rui <rui.zhang@...el.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux PM mailing list <linux-pm@...r.kernel.org>,
        Amjad Ouled-Ameur <aouledameur@...libre.com>,
        Fabien Parent <fparent@...libre.com>,
        Markus Schneider-Pargmann <msp@...libre.com>,
        Wolfram Sang <wsa+renesas@...g-engineering.com>,
        Yang Li <yang.lee@...ux.alibaba.com>
Subject: Re: [GIT PULL] thermal for v6.4-rc1

On 05/04/2023 20:48, Rafael J. Wysocki wrote:
> On Wed, Apr 5, 2023 at 8:39 PM Rafael J. Wysocki <rafael@...nel.org> wrote:
>>
>> On Wed, Apr 5, 2023 at 8:32 PM Daniel Lezcano <daniel.lezcano@...aro.org> wrote:
>>>
>>>
>>> Hi Rafael,
>>>
>>> just a gentle reminder
>>
>> This is in my linux-next branch, I'll merge it into thermal tomorrow.
>>
>>>   because more material will come in the next days
>>
>> So why can't it wait?
> 
> BTW, I get a merge conflict in
> drivers/thermal/mediatek/auxadc_thermal.c on an attempt to merge
> thermal/linux-next into my linux-next branch.

Ah?

I did an update and rebased thermal/linux-next on top of 
linux-pm/thermal without conflict

Is it possible you have a change in a different branch conflicting with it ?


-- 
<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