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: <6b732afc-cc46-97df-9aac-af20292228c4@intel.com>
Date:   Wed, 25 Jan 2023 12:57:00 +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>,
        "Rafael J. Wysocki" <rjw@...ysocki.net>
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:45 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the thermal tree got a conflict in:
>
>    drivers/thermal/thermal_acpi.c
>
> between commit:
>
>    7a0e39748861 ("thermal: ACPI: Add ACPI trip point routines")
>
> from the pm tree and commit:
>
>    4bb6439371e9 ("thermal/acpi: Add ACPI trip point routines")
>
> from the thermal tree.
>
> These commits are very similar, and I just used the former (as it
> is newer).

Thank you, this is correct.

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

Cheers,

Rafael