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

[Daniel Lezcano]

On 05/04/2023 20:48, Rafael J. Wysocki wrote:
> On Wed, Apr 5, 2023 at 8:39 PM Rafael J. Wysocki <rafael@xxxxxxxxxx> wrote:
> > On Wed, Apr 5, 2023 at 8:32 PM Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> 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