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] [day] [month] [year] [list]

Date:   Thu, 6 Apr 2023 20:47:26 +0200
From:   "Rafael J. Wysocki" <rafael@...nel.org>
To:     Daniel Lezcano <daniel.lezcano@...aro.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 Wed, Apr 5, 2023 at 9:06 PM Rafael J. Wysocki <rafael@...nel.org> wrote:
>
> On Wed, Apr 5, 2023 at 9:03 PM Daniel Lezcano <daniel.lezcano@...aro.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@...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 ?
>
> 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!