linux-kernel - Re: linux-next: manual merge of the thermal tree with the pm tree

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]

Message-ID: <bc2f3bec-43c6-ede5-42be-f06babab0ca3@intel.com>
Date:   Wed, 25 Jan 2023 12:57:26 +0100
From:   "Wysocki, Rafael J" <rafael.j.wysocki@...el.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Daniel Lezcano <daniel.lezcano@...aro.org>,
        Zhang Rui <rui.zhang@...el.com>
CC:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        "Linux Next Mailing List" <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the thermal tree with the pm tree


On 1/24/2023 11:39 PM, Stephen Rothwell wrote:
> Hi all,
>
> FIXME: Add owner of second tree to To:
>         Add author(s)/SOB of conflicting commits.
>
> Today's linux-next merge of the thermal tree got a conflict in:
>
>    drivers/thermal/intel/intel_pch_thermal.c
>
> between commit:
>
>    fee19c692160 ("thermal: intel: intel_pch: Use generic trip points")
>
> from the pm tree and commit:
>
>    9e631aa90c97 ("thermal/drivers/intel: Use generic trip points for intel_pch")
>
> from the thermal tree.
>
> These commits are very similar, so I just used the former version (since
> it was newer).

Thank you, this is correct.

The linux-next branch in the thermal tree needs to be updated.

Cheers,

Rafael