From: Viresh Kumar <viresh.kumar@linaro.org>
To: Sudeep Holla <sudeep.holla@arm.com>
Cc: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
nico@fluxnic.net
Subject: Re: [PATCH v3 2/5] cpufreq: merge arm_big_little and vexpress-spc
Date: Mon, 21 Oct 2019 08:10:49 +0530 [thread overview]
Message-ID: <20191021024049.uyit2zp24l6jqzf5@vireshk-i7> (raw)
In-Reply-To: <20191018103749.11226-3-sudeep.holla@arm.com>
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.kumar@linaro.org>");
> -MODULE_DESCRIPTION("Generic ARM big LITTLE cpufreq driver");
> +MODULE_AUTHOR("Sudeep Holla <sudeep.holla@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.kumar@linaro.org>");
+ MODULE_AUTHOR("Sudeep Holla <sudeep.holla@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
next prev parent reply other threads:[~2019-10-21 2:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-18 10:37 [PATCH v3 0/5] cpufreq: merge arm big.LITTLE and vexpress-spc drivers Sudeep Holla
2019-10-18 10:37 ` [PATCH v3 1/5] cpufreq: scpi: remove stale/outdated comment about the driver Sudeep Holla
2019-10-18 10:37 ` [PATCH v3 2/5] cpufreq: merge arm_big_little and vexpress-spc Sudeep Holla
2019-10-21 2:40 ` Viresh Kumar [this message]
2019-10-21 10:20 ` [RESEND] " Sudeep Holla
2019-10-18 10:37 ` [PATCH v3 3/5] cpufreq: vexpress-spc: drop unnessary cpufreq_arm_bL_ops abstraction Sudeep Holla
2019-10-18 10:37 ` [PATCH v3 4/5] cpufreq: vexpress-spc: remove lots of debug messages Sudeep Holla
2019-10-18 10:37 ` [PATCH v3 5/5] cpufreq: vexpress-spc: fix some coding style issues Sudeep Holla
2019-10-21 10:54 ` [PATCH v3 0/5] cpufreq: merge arm big.LITTLE and vexpress-spc drivers Viresh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191021024049.uyit2zp24l6jqzf5@vireshk-i7 \
--to=viresh.kumar@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=nico@fluxnic.net \
--cc=rjw@rjwysocki.net \
--cc=sudeep.holla@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.