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
