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

From: Rafael J. Wysocki
Date: Wed Apr 05 2023 - 14:48:25 EST


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.