于 2013年03月07日 13:38, Chen Gang 写道:
> 于 2013年03月07日 13:19, Dan Carpenter 写道:
>> > Sending the patch included at the bottom of an email makes the
>> > git log a bit messy. All the discussion at the top of the email
>> > gets included at the top of the git log. Try it with git am to
>> > see what I mean,
>> > 1) save the entire email as text.
>> > 2) cat raw_email_with_headers.txt | git am
>> >
>> > Put this kind of discussion after the Signed-off-by line, infront
>> > of the diffstat. That section of the email is not saved to the
>> > git log.
> ok, thank you, I will try, now.
after tried, I did not find any issues about my original reply
if delete the wast things before "From: Chen Gang <[email protected]>"
line.
"git am" can succeed apply it.
do I misuderstand what you said ? (or I need additional trying ?)
thanks.
:-)
于 2013年03月07日 13:38, Chen Gang 写道:
> 于 2013年03月05日 16:45, Greg KH 写道:
>> This patch fails to apply to my tree :(
>
> the relative file has been changed much during these days.
> I need send the patch again based on next-20130307 tree.
>
> I append the patch below, if need send it with patch v2, please tell me,
> thanks.
>
>
>
> From: Chen Gang <[email protected]>
> Date: Thu, 7 Mar 2013 12:53:31 +0800
> Subject: [PATCH] drivers/staging/zcache: using strlcpy instead of strncpy
>
> for NUL terminated string, need alway set '\0' in the end.
>
> Signed-off-by: Chen Gang <[email protected]>
> ---
> drivers/staging/zcache/zcache-main.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/staging/zcache/zcache-main.c
> b/drivers/staging/zcache/zcache-main.c
> index 7c0fda4..7a6dd96 100644
> --- a/drivers/staging/zcache/zcache-main.c
> +++ b/drivers/staging/zcache/zcache-main.c
> @@ -19,6 +19,7 @@
> #include <linux/slab.h>
> #include <linux/spinlock.h>
> #include <linux/types.h>
> +#include <linux/string.h>
> #include <linux/atomic.h>
> #include <linux/math64.h>
> #include <linux/crypto.h>
> @@ -1688,7 +1689,7 @@ __setup("nocleancacheignorenonactive",
> no_cleancache_ignore_nonactive);
>
> static int __init enable_zcache_compressor(char *s)
> {
> - strncpy(zcache_comp_name, s, ZCACHE_COMP_NAME_SZ);
> + strlcpy(zcache_comp_name, s, sizeof(zcache_comp_name));
> zcache_enabled = true;
> return 1;
> }
>
--
Chen Gang
Asianux Corporation
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
