On 18-10-19, 11:37, Sudeep Holla wrote: > +static struct platform_driver ve_spc_cpufreq_platdrv = { > + .driver = { > + .name = "vexpress-spc-cpufreq", > + }, > + .probe = ve_spc_cpufreq_probe, > + .remove = ve_spc_cpufreq_remove, > +}; > +module_platform_driver(ve_spc_cpufreq_platdrv); > > MODULE_AUTHOR("Viresh Kumar <viresh.ku...@linaro.org>"); > -MODULE_DESCRIPTION("Generic ARM big LITTLE cpufreq driver"); > +MODULE_AUTHOR("Sudeep Holla <sudeep.ho...@arm.com>"); > +MODULE_DESCRIPTION("Vexpress SPC ARM big LITTLE cpufreq driver"); > MODULE_LICENSE("GPL v2");
Strange. The -B option you used while generating the patch makes it fails to get applied om my side with am -3. git doesn't get the rename of file properly and shows me this conflict: static int ve_spc_init_opp_table(const struct cpumask *cpumask) { @@@ -68,4 -697,7 +727,11 @@@ static struct platform_driver ve_spc_cp }; module_platform_driver(ve_spc_cpufreq_platdrv); ++<<<<<<< HEAD +MODULE_LICENSE("GPL"); ++======= + MODULE_AUTHOR("Viresh Kumar <viresh.ku...@linaro.org>"); + MODULE_AUTHOR("Sudeep Holla <sudeep.ho...@arm.com>"); + MODULE_DESCRIPTION("Vexpress SPC ARM big LITTLE cpufreq driver"); + MODULE_LICENSE("GPL v2"); ++>>>>>>> cpufreq: merge arm_big_little and vexpress-spc Can you resend this patch (only) without the -B option ? -- viresh