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
