linux-kernel - Re: [PATCH] Staging: comedi: adl

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20140716202852.GA22789@kroah.com>
Date:	Wed, 16 Jul 2014 13:28:52 -0700
From:	Greg KH <gregkh@...uxfoundation.org>
To:	Sam Asadi <asadi.samuel@...il.com>
Cc:	devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] Staging: comedi: adl_pci9118: a style issue fixed

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@...il.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/