On Thu, 2011-02-17 at 08:08 +0900, sola wrote:
From 494eb1f2bb56261815e4230e582d27311f32ae81 Mon Sep 17 00:00:00 2001 From: Akihiro MAEDA sola.1980.a@gmail.com Date: Thu, 17 Feb 2011 07:16:37 +0900 Subject: [PATCH 1/1] Add virtual battery driver
This patch adds virtual battery driver. This is based on git://git.linaro.org/people/jstultz/linux.git dev/linaro.android
Signed-off-by: Akihiro MAEDA sola.1980.a@gmail.com
Thanks so much for sending this! I have a few comments below.
- Author: Masashi YOKOTA yokota@pylone.jp
- Modified by: Akihiro MAEDA sola.1980.a@gmail.com
So there has been some discussion on lkml about how to best handle cases where someone is trying to merge a modified work by someone else.
The consensus seemed to be that the original author should be preserved in the "From:" header in the patch.
You can fix this by doing: git commit --amend --author "Masashi YOKOTA yokota@pylone.jp"
Then in the changelog, state what changes you have made. And add your signed-off-by.
The git log will show the original author in the commit log, but changelog note and the signed-off chain will show your involvement.
Alternatively, you can submit two patches, one the original work, credited to the author, and including your signed-off-by, and then the second your specific modifications. This better preserves the history of the work.
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) +static int param_set_ac_status(const char *key, const struct kernel_param *kp) +#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */ +static int param_set_ac_status(const char *key, struct kernel_param *kp) +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) *
Since you are submitting this against 2.6.37, please remove the KERNE_VERSION specific ifdefs.
Overall, it looks good. This seems generic enough that while we can take it for the Linaro+Android tree after the above changes, we should consider sending it to lkml for review and possible inclusion into 2.6.39.
thanks -john