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;
MIME-Version: 1.0
References: <ab323c72-61f9-9ac6-48ce-366f62e82091@linaro.org>
 <3e64e6b2-7c3f-d149-2f7d-6c41be4c4d14@linaro.org> <CAJZ5v0ji6SxrgiMRMwNDwGspxifo0FSi3d5+2O02SKM_q_OaFA@mail.gmail.com>
 <CAJZ5v0iNbA0rt3QyaFA7ved19yK8-nabyJi7yCfbnVKQaMPCmA@mail.gmail.com>
 <c230ab3a-9cc3-e989-1e49-7d38be471a5c@linaro.org> <CAJZ5v0i95D_duiEnBiTgCSGTJ9_q7VYmb9y8O6yuPQ7Yp=BD3Q@mail.gmail.com>
In-Reply-To: <CAJZ5v0i95D_duiEnBiTgCSGTJ9_q7VYmb9y8O6yuPQ7Yp=BD3Q@mail.gmail.com>
From:   "Rafael J. Wysocki" <rafael@kernel.org>
Date:   Thu, 6 Apr 2023 20:47:26 +0200
Message-ID: <CAJZ5v0jhK431LMObxQ2seNGGQEPd2tQHhRmbeWG1b=yzSO6gKA@mail.gmail.com>
Subject: Re: [GIT PULL] thermal for v6.4-rc1
To:     Daniel Lezcano <daniel.lezcano@linaro.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>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8BIT
Precedence: bulk

On Wed, Apr 5, 2023 at 9:06 PM Rafael J. Wysocki <rafael@kernel.org> wrote:
>
> On Wed, Apr 5, 2023 at 9:03 PM Daniel Lezcano <daniel.lezcano@linaro.org> wrote:
> >
> > 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 ?
>
> It is not impossible, but quite unlikely.
>
> I'll see what's going on tomorrow.

Confirmed, thermal/linux-next merges on top of the current
linux-pm/thermal (just pushed out) without conflicts.

There is a conflict between linux-pm/bleeding-edge and
thermal/bleeding-edge, but it's easy to resolve.

Thanks!