* [PATCH] Staging: comedi: adl_pci9118: a style issue fixed
@ 2014-07-16 12:24 Sam Asadi
2014-07-16 13:14 ` Joe Perches
2014-07-16 20:28 ` Greg KH
0 siblings, 2 replies; 3+ messages in thread
From: Sam Asadi @ 2014-07-16 12:24 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Sam Asadi
'quoted string split across lines' warning in checkpatching fixed
by group whole string in one line.
Signed-off-by: Sam Asadi <asadi.samuel@gmail.com>
---
drivers/staging/comedi/drivers/adl_pci9118.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 59a65cb..b2d25f5 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -412,8 +412,7 @@ static int check_channel_list(struct comedi_device *dev,
if ((CR_AREF(chanlist[i]) == AREF_DIFF) !=
(differencial)) {
comedi_error(dev,
- "Differencial and single ended "
- "inputs can't be mixtured!");
+ "Differencial and single ended inputs can't be mixtured!");
return 0;
}
if ((CR_RANGE(chanlist[i]) < PCI9118_BIPOLAR_RANGES) !=
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Staging: comedi: adl_pci9118: a style issue fixed
2014-07-16 12:24 [PATCH] Staging: comedi: adl_pci9118: a style issue fixed Sam Asadi
@ 2014-07-16 13:14 ` Joe Perches
2014-07-16 20:28 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Joe Perches @ 2014-07-16 13:14 UTC (permalink / raw)
To: Sam Asadi; +Cc: gregkh, devel, linux-kernel
On Wed, 2014-07-16 at 15:24 +0300, Sam Asadi wrote:
> 'quoted string split across lines' warning in checkpatching fixed
> by group whole string in one line.
[]
> diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
[]
> @@ -412,8 +412,7 @@ static int check_channel_list(struct comedi_device *dev,
> if ((CR_AREF(chanlist[i]) == AREF_DIFF) !=
> (differencial)) {
> comedi_error(dev,
> - "Differencial and single ended "
> - "inputs can't be mixtured!");
> + "Differencial and single ended inputs can't be mixtured!");
Might as well fix the fractured misspellings too.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Staging: comedi: adl_pci9118: a style issue fixed
2014-07-16 12:24 [PATCH] Staging: comedi: adl_pci9118: a style issue fixed Sam Asadi
2014-07-16 13:14 ` Joe Perches
@ 2014-07-16 20:28 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2014-07-16 20:28 UTC (permalink / raw)
To: Sam Asadi; +Cc: devel, linux-kernel
On Wed, Jul 16, 2014 at 03:24:12PM +0300, Sam Asadi wrote:
> 'quoted string split across lines' warning in checkpatching fixed
> by group whole string in one line.
>
> Signed-off-by: Sam Asadi <asadi.samuel@gmail.com>
> ---
> drivers/staging/comedi/drivers/adl_pci9118.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
> index 59a65cb..b2d25f5 100644
> --- a/drivers/staging/comedi/drivers/adl_pci9118.c
> +++ b/drivers/staging/comedi/drivers/adl_pci9118.c
> @@ -412,8 +412,7 @@ static int check_channel_list(struct comedi_device *dev,
> if ((CR_AREF(chanlist[i]) == AREF_DIFF) !=
> (differencial)) {
> comedi_error(dev,
> - "Differencial and single ended "
> - "inputs can't be mixtured!");
> + "Differencial and single ended inputs can't be mixtured!");
> return 0;
> }
> if ((CR_RANGE(chanlist[i]) < PCI9118_BIPOLAR_RANGES) !=
> --
I get a very odd error when trying to apply this patch with git:
$ git am -s ../s1
Applying: Staging: comedi: adl_pci9118: a style issue fixed
fatal: corrupt patch at line 10
Patch failed at 0001 Staging: comedi: adl_pci9118: a style issue fixed
The copy of the patch that failed is found in:
/home/gregkh/linux/work/staging/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Can you please fix this up and resend it in a format I can apply it in?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-07-16 20:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-16 12:24 [PATCH] Staging: comedi: adl_pci9118: a style issue fixed Sam Asadi
2014-07-16 13:14 ` Joe Perches
2014-07-16 20:28 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).