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

Hi, Stephen, On Fri, 2014-10-10 at 12:10 +1100, Stephen Rothwell wrote: > Hi Zhang, > > Today's linux-next merge of the thermal tree got a conflict in > drivers/acpi/fan.c between commit 88989fd26a74 ("ACPI / fan: printk > replacement") from the pm tree and commits 71532a58d2b0 ("ACPI / fan: > re

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

Hi Zhang, Today's linux-next merge of the thermal tree got a conflict in drivers/acpi/fan.c between commit 88989fd26a74 ("ACPI / fan: printk replacement") from the pm tree and commits 71532a58d2b0 ("ACPI / fan: remove unused macro") and ff39c76855e8 ("ACPI / fan: convert to platform driver") from

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

Hi Zhang, Today's linux-next merge of the thermal tree got a conflict in drivers/cpufreq/Kconfig between commit 109df086e002 ("cpufreq: Select PM_OPP rather than depending on it") from the pm tree and commit 77cff5926a14 ("cpufreq: cpufreq-cpu0: add dt node parsing for cooling device properties")