From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Zhang Rui <rui.zhang@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux PM mailing list <linux-pm@vger.kernel.org>,
Amjad Ouled-Ameur <aouledameur@baylibre.com>,
Fabien Parent <fparent@baylibre.com>,
Markus Schneider-Pargmann <msp@baylibre.com>,
Wolfram Sang <wsa+renesas@sang-engineering.com>,
Yang Li <yang.lee@linux.alibaba.com>
Subject: Re: [GIT PULL] thermal for v6.4-rc1
Date: Wed, 5 Apr 2023 21:03:35 +0200 [thread overview]
Message-ID: <c230ab3a-9cc3-e989-1e49-7d38be471a5c@linaro.org> (raw)
In-Reply-To: <CAJZ5v0iNbA0rt3QyaFA7ved19yK8-nabyJi7yCfbnVKQaMPCmA@mail.gmail.com>
On 05/04/2023 20:48, Rafael J. Wysocki wrote:
> On Wed, Apr 5, 2023 at 8:39 PM Rafael J. Wysocki <rafael@kernel.org> wrote:
>>
>> On Wed, Apr 5, 2023 at 8:32 PM Daniel Lezcano <daniel.lezcano@linaro.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
next prev parent reply other threads:[~2023-04-05 19:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-01 19:04 Daniel Lezcano
2023-04-05 18:32 ` Daniel Lezcano
2023-04-05 18:39 ` Rafael J. Wysocki
2023-04-05 18:48 ` Rafael J. Wysocki
2023-04-05 19:03 ` Daniel Lezcano [this message]
2023-04-05 19:06 ` Rafael J. Wysocki
2023-04-06 18:47 ` Rafael J. Wysocki
2023-04-05 18:57 ` Daniel Lezcano
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=c230ab3a-9cc3-e989-1e49-7d38be471a5c@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=aouledameur@baylibre.com \
--cc=fparent@baylibre.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=msp@baylibre.com \
--cc=rafael@kernel.org \
--cc=rjw@rjwysocki.net \
--cc=rui.zhang@intel.com \
--cc=wsa+renesas@sang-engineering.com \
--cc=yang.lee@linux.alibaba.com \
/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
all inboxes | Powered by JetHome®