Messages in this thread | | | Date | Wed, 6 Feb 2019 10:52:28 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the opp tree with the pm tree |
| |
Hi Viresh,
Today's linux-next merge of the opp tree got a conflict in:
drivers/cpufreq/scmi-cpufreq.c
between commit:
5da7af9a94a7 ("cpufreq: scmi: Use auto-registration of thermal cooling device")
from the pm tree and commit:
d7194c939ea3 ("cpufreq: scmi: Register an Energy Model")
from the opp tree.
I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
-- Cheers, Stephen Rothwell
diff --cc drivers/cpufreq/scmi-cpufreq.c index 66b633b48eb1,44449ff8ad47..000000000000 --- a/drivers/cpufreq/scmi-cpufreq.c +++ b/drivers/cpufreq/scmi-cpufreq.c @@@ -11,6 -11,8 +11,7 @@@ #include <linux/cpu.h> #include <linux/cpufreq.h> #include <linux/cpumask.h> -#include <linux/cpu_cooling.h> + #include <linux/energy_model.h> #include <linux/export.h> #include <linux/module.h> #include <linux/pm_opp.h> [unhandled content-type:application/pgp-signature] | |