Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1662755 > unrolled thread

[PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

Started bysrishti sharma <srishtishar@gmail.com>
First post2017-06-09 23:10 +0200
Last post2017-06-14 16:00 +0200
Articles 9 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis. srishti sharma <srishtishar@gmail.com> - 2017-06-09 23:10 +0200
    Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c:  Fixed alignment to match open parenthesis. Greg KH <gregkh@linuxfoundation.org> - 2017-06-13 15:10 +0200
      Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c:  Fixed alignment to match open parenthesis. srishti sharma <srishtishar@gmail.com> - 2017-06-13 16:40 +0200
        Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c:  Fixed alignment to match open parenthesis. Dan Carpenter <dan.carpenter@oracle.com> - 2017-06-13 16:50 +0200
          Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c:  Fixed alignment to match open parenthesis. srishti sharma <srishtishar@gmail.com> - 2017-06-13 23:50 +0200
            Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c:  Fixed alignment to match open parenthesis. Greg KH <gregkh@linuxfoundation.org> - 2017-06-14 07:20 +0200
              Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c:  Fixed alignment to match open parenthesis. srishti sharma <srishtishar@gmail.com> - 2017-06-14 15:50 +0200
                Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c:  Fixed alignment to match open parenthesis. Greg KH <gregkh@linuxfoundation.org> - 2017-06-14 16:00 +0200
                  Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c:  Fixed alignment to match open parenthesis. srishti sharma <srishtishar@gmail.com> - 2017-06-14 16:00 +0200

#1662755 — [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

Fromsrishti sharma <srishtishar@gmail.com>
Date2017-06-09 23:10 +0200
Subject[PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.
Message-ID<tQzkl-6zR-5@gated-at.bofh.it>
Fixed alignment so that it matched open parenthesis.

Signed-off-by: srishti sharma <srishtishar@gmail.com>
---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
index f484bb0..2148ed0 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
@@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
 }

 static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
-				struct snd_ctl_elem_value *ucontrol)
+			       struct snd_ctl_elem_value *ucontrol)
 {
	struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
	int changed = 0;
--
2.7.4

[toc] | [next] | [standalone]

#1664832 — Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

FromGreg KH <gregkh@linuxfoundation.org>
Date2017-06-13 15:10 +0200
SubjectRe: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.
Message-ID<tRTK2-8oY-21@gated-at.bofh.it>
In reply to#1662755
On Sat, Jun 10, 2017 at 02:37:22AM +0530, srishti sharma wrote:
> Fixed alignment so that it matched open parenthesis.
> 
> Signed-off-by: srishti sharma <srishtishar@gmail.com>
> ---
>  drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
> index f484bb0..2148ed0 100644
> --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
> +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
> @@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
>  }
> 
>  static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
> -				struct snd_ctl_elem_value *ucontrol)
> +			       struct snd_ctl_elem_value *ucontrol)
>  {
> 	struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
> 	int changed = 0;

This patch is corrupted and can not be applied :(

[toc] | [prev] | [next] | [standalone]

#1664931 — Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

Fromsrishti sharma <srishtishar@gmail.com>
Date2017-06-13 16:40 +0200
SubjectRe: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.
Message-ID<tRV98-Fy-23@gated-at.bofh.it>
In reply to#1664832
On Tue, Jun 13, 2017 at 6:30 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
> On Sat, Jun 10, 2017 at 02:37:22AM +0530, srishti sharma wrote:
>> Fixed alignment so that it matched open parenthesis.
>>
>> Signed-off-by: srishti sharma <srishtishar@gmail.com>
>> ---
>>  drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
>> index f484bb0..2148ed0 100644
>> --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
>> +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
>> @@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
>>  }
>>
>>  static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
>> -                             struct snd_ctl_elem_value *ucontrol)
>> +                            struct snd_ctl_elem_value *ucontrol)
>>  {
>>       struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
>>       int changed = 0;
>
> This patch is corrupted and can not be applied :(


Why is this corrupted ?

Regards,
Srishti

[toc] | [prev] | [next] | [standalone]

#1664944 — Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

FromDan Carpenter <dan.carpenter@oracle.com>
Date2017-06-13 16:50 +0200
SubjectRe: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.
Message-ID<tRViO-Jw-31@gated-at.bofh.it>
In reply to#1664931
On Tue, Jun 13, 2017 at 08:07:14PM +0530, srishti sharma wrote:
> On Tue, Jun 13, 2017 at 6:30 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
> > On Sat, Jun 10, 2017 at 02:37:22AM +0530, srishti sharma wrote:
> >> Fixed alignment so that it matched open parenthesis.
> >>
> >> Signed-off-by: srishti sharma <srishtishar@gmail.com>
> >> ---
> >>  drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
> >> index f484bb0..2148ed0 100644
> >> --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
> >> +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
> >> @@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
> >>  }
> >>
> >>  static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
> >> -                             struct snd_ctl_elem_value *ucontrol)
> >> +                            struct snd_ctl_elem_value *ucontrol)
> >>  {
> >>       struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
> >>       int changed = 0;
> >
> > This patch is corrupted and can not be applied :(
> 
> 
> Why is this corrupted ?

Try applying it with `git am`.  There should be space characters at the
start of these lines but your email client deleted them:

	struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
	int changed = 0;

Read Documentation/process/email-clients.rst

regards,
dan carpenter

[toc] | [prev] | [next] | [standalone]

#1665224 — Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

Fromsrishti sharma <srishtishar@gmail.com>
Date2017-06-13 23:50 +0200
SubjectRe: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.
Message-ID<tS1Rg-4OB-5@gated-at.bofh.it>
In reply to#1664944
On Tue, Jun 13, 2017 at 8:17 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> On Tue, Jun 13, 2017 at 08:07:14PM +0530, srishti sharma wrote:
>> On Tue, Jun 13, 2017 at 6:30 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
>> > On Sat, Jun 10, 2017 at 02:37:22AM +0530, srishti sharma wrote:
>> >> Fixed alignment so that it matched open parenthesis.
>> >>
>> >> Signed-off-by: srishti sharma <srishtishar@gmail.com>
>> >> ---
>> >>  drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
>> >>  1 file changed, 1 insertion(+), 1 deletion(-)
>> >>
>> >> diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
>> >> index f484bb0..2148ed0 100644
>> >> --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
>> >> +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
>> >> @@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
>> >>  }
>> >>
>> >>  static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
>> >> -                             struct snd_ctl_elem_value *ucontrol)
>> >> +                            struct snd_ctl_elem_value *ucontrol)
>> >>  {
>> >>       struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
>> >>       int changed = 0;
>> >
>> > This patch is corrupted and can not be applied :(
>>
>>
>> Why is this corrupted ?
>
> Try applying it with `git am`.  There should be space characters at the
> start of these lines but your email client deleted them:
>
>         struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
>         int changed = 0;
>
> Read Documentation/process/email-clients.rst
>
> regards,
> dan carpenter


Hello,

I tried applying it with ' git am ' and it was giving me this error:

fatal: corrupt patch at line XX

I think this was produced because of running ./scripts/cleanfile on the patch .
I was using this to fix trailing whitespaces . So, I used a different
method to remove them and didn't get that error.

But now when I run 'git am' I get a different error:

error: patch failed:
drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c:105

Why am I getting this error ?

Regards,
Srishti

[toc] | [prev] | [next] | [standalone]

#1665427 — Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

FromGreg KH <gregkh@linuxfoundation.org>
Date2017-06-14 07:20 +0200
SubjectRe: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.
Message-ID<tS8SJ-Yi-3@gated-at.bofh.it>
In reply to#1665224
On Wed, Jun 14, 2017 at 03:15:11AM +0530, srishti sharma wrote:
> On Tue, Jun 13, 2017 at 8:17 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> > On Tue, Jun 13, 2017 at 08:07:14PM +0530, srishti sharma wrote:
> >> On Tue, Jun 13, 2017 at 6:30 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
> >> > On Sat, Jun 10, 2017 at 02:37:22AM +0530, srishti sharma wrote:
> >> >> Fixed alignment so that it matched open parenthesis.
> >> >>
> >> >> Signed-off-by: srishti sharma <srishtishar@gmail.com>
> >> >> ---
> >> >>  drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
> >> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >> >>
> >> >> diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
> >> >> index f484bb0..2148ed0 100644
> >> >> --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
> >> >> +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
> >> >> @@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
> >> >>  }
> >> >>
> >> >>  static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
> >> >> -                             struct snd_ctl_elem_value *ucontrol)
> >> >> +                            struct snd_ctl_elem_value *ucontrol)
> >> >>  {
> >> >>       struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
> >> >>       int changed = 0;
> >> >
> >> > This patch is corrupted and can not be applied :(
> >>
> >>
> >> Why is this corrupted ?
> >
> > Try applying it with `git am`.  There should be space characters at the
> > start of these lines but your email client deleted them:
> >
> >         struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
> >         int changed = 0;
> >
> > Read Documentation/process/email-clients.rst
> >
> > regards,
> > dan carpenter
> 
> 
> Hello,
> 
> I tried applying it with ' git am ' and it was giving me this error:
> 
> fatal: corrupt patch at line XX

Exactly.

> I think this was produced because of running ./scripts/cleanfile on the patch .

Why would you do that?  By doing that you corrupted the patch file :(

Just use the proper output of 'git format-patch' and all will be fine.

thanks,

greg k-h

[toc] | [prev] | [next] | [standalone]

#1665847 — Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

Fromsrishti sharma <srishtishar@gmail.com>
Date2017-06-14 15:50 +0200
SubjectRe: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.
Message-ID<tSgQi-5OL-37@gated-at.bofh.it>
In reply to#1665427
On Wed, Jun 14, 2017 at 10:39 AM, Greg KH <gregkh@linuxfoundation.org> wrote:
> On Wed, Jun 14, 2017 at 03:15:11AM +0530, srishti sharma wrote:
>> On Tue, Jun 13, 2017 at 8:17 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
>> > On Tue, Jun 13, 2017 at 08:07:14PM +0530, srishti sharma wrote:
>> >> On Tue, Jun 13, 2017 at 6:30 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
>> >> > On Sat, Jun 10, 2017 at 02:37:22AM +0530, srishti sharma wrote:
>> >> >> Fixed alignment so that it matched open parenthesis.
>> >> >>
>> >> >> Signed-off-by: srishti sharma <srishtishar@gmail.com>
>> >> >> ---
>> >> >>  drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
>> >> >>  1 file changed, 1 insertion(+), 1 deletion(-)
>> >> >>
>> >> >> diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
>> >> >> index f484bb0..2148ed0 100644
>> >> >> --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
>> >> >> +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
>> >> >> @@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
>> >> >>  }
>> >> >>
>> >> >>  static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
>> >> >> -                             struct snd_ctl_elem_value *ucontrol)
>> >> >> +                            struct snd_ctl_elem_value *ucontrol)
>> >> >>  {
>> >> >>       struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
>> >> >>       int changed = 0;
>> >> >
>> >> > This patch is corrupted and can not be applied :(
>> >>
>> >>
>> >> Why is this corrupted ?
>> >
>> > Try applying it with `git am`.  There should be space characters at the
>> > start of these lines but your email client deleted them:
>> >
>> >         struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
>> >         int changed = 0;
>> >
>> > Read Documentation/process/email-clients.rst
>> >
>> > regards,
>> > dan carpenter
>>
>>
>> Hello,
>>
>> I tried applying it with ' git am ' and it was giving me this error:
>>
>> fatal: corrupt patch at line XX
>
> Exactly.
>
>> I think this was produced because of running ./scripts/cleanfile on the patch .
>
> Why would you do that?  By doing that you corrupted the patch file :(

After I run ./scritps/checkpatch.pl on the patch produced by git
format-patch it has trailing whitespaces . So I was using
./scripts/cleanfile to fix that , I am not doing that anymore and am
also not getting the corrupt patch error .
>
> Just use the proper output of 'git format-patch' and all will be fine.

I have done this and am still getting these errors:

error: patch failed:
drivers/staging/vc04_services/bcm2835-audio/bcm2835-      ctl.c:105

error: drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c:
patch does not apply


Why is it not applying ?

Regards,
Srishti

[toc] | [prev] | [next] | [standalone]

#1665855 — Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

FromGreg KH <gregkh@linuxfoundation.org>
Date2017-06-14 16:00 +0200
SubjectRe: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.
Message-ID<tSgZX-5S3-7@gated-at.bofh.it>
In reply to#1665847
On Wed, Jun 14, 2017 at 07:11:01PM +0530, srishti sharma wrote:
> On Wed, Jun 14, 2017 at 10:39 AM, Greg KH <gregkh@linuxfoundation.org> wrote:
> > On Wed, Jun 14, 2017 at 03:15:11AM +0530, srishti sharma wrote:
> >> On Tue, Jun 13, 2017 at 8:17 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> >> > On Tue, Jun 13, 2017 at 08:07:14PM +0530, srishti sharma wrote:
> >> >> On Tue, Jun 13, 2017 at 6:30 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
> >> >> > On Sat, Jun 10, 2017 at 02:37:22AM +0530, srishti sharma wrote:
> >> >> >> Fixed alignment so that it matched open parenthesis.
> >> >> >>
> >> >> >> Signed-off-by: srishti sharma <srishtishar@gmail.com>
> >> >> >> ---
> >> >> >>  drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
> >> >> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >> >> >>
> >> >> >> diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
> >> >> >> index f484bb0..2148ed0 100644
> >> >> >> --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
> >> >> >> +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
> >> >> >> @@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
> >> >> >>  }
> >> >> >>
> >> >> >>  static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
> >> >> >> -                             struct snd_ctl_elem_value *ucontrol)
> >> >> >> +                            struct snd_ctl_elem_value *ucontrol)
> >> >> >>  {
> >> >> >>       struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
> >> >> >>       int changed = 0;
> >> >> >
> >> >> > This patch is corrupted and can not be applied :(
> >> >>
> >> >>
> >> >> Why is this corrupted ?
> >> >
> >> > Try applying it with `git am`.  There should be space characters at the
> >> > start of these lines but your email client deleted them:
> >> >
> >> >         struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
> >> >         int changed = 0;
> >> >
> >> > Read Documentation/process/email-clients.rst
> >> >
> >> > regards,
> >> > dan carpenter
> >>
> >>
> >> Hello,
> >>
> >> I tried applying it with ' git am ' and it was giving me this error:
> >>
> >> fatal: corrupt patch at line XX
> >
> > Exactly.
> >
> >> I think this was produced because of running ./scripts/cleanfile on the patch .
> >
> > Why would you do that?  By doing that you corrupted the patch file :(
> 
> After I run ./scritps/checkpatch.pl on the patch produced by git
> format-patch it has trailing whitespaces . So I was using
> ./scripts/cleanfile to fix that , I am not doing that anymore and am
> also not getting the corrupt patch error .

That means your code had trailing whitespaces, always fix that and NEVER
hand-edit or modify a patch unless you really know what you are doing.

> > Just use the proper output of 'git format-patch' and all will be fine.
> 
> I have done this and am still getting these errors:
> 
> error: patch failed:
> drivers/staging/vc04_services/bcm2835-audio/bcm2835-      ctl.c:105
> 
> error: drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c:
> patch does not apply
> 
> 
> Why is it not applying ?

That is up to you to figure out, we have no idea as to exactly what you
are doing :)

good luck!

greg k-h

[toc] | [prev] | [next] | [standalone]

#1665856 — Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.

Fromsrishti sharma <srishtishar@gmail.com>
Date2017-06-14 16:00 +0200
SubjectRe: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis.
Message-ID<tSgZX-5S3-9@gated-at.bofh.it>
In reply to#1665855
On Wed, Jun 14, 2017 at 7:19 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
> On Wed, Jun 14, 2017 at 07:11:01PM +0530, srishti sharma wrote:
>> On Wed, Jun 14, 2017 at 10:39 AM, Greg KH <gregkh@linuxfoundation.org> wrote:
>> > On Wed, Jun 14, 2017 at 03:15:11AM +0530, srishti sharma wrote:
>> >> On Tue, Jun 13, 2017 at 8:17 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
>> >> > On Tue, Jun 13, 2017 at 08:07:14PM +0530, srishti sharma wrote:
>> >> >> On Tue, Jun 13, 2017 at 6:30 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
>> >> >> > On Sat, Jun 10, 2017 at 02:37:22AM +0530, srishti sharma wrote:
>> >> >> >> Fixed alignment so that it matched open parenthesis.
>> >> >> >>
>> >> >> >> Signed-off-by: srishti sharma <srishtishar@gmail.com>
>> >> >> >> ---
>> >> >> >>  drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 2 +-
>> >> >> >>  1 file changed, 1 insertion(+), 1 deletion(-)
>> >> >> >>
>> >> >> >> diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
>> >> >> >> index f484bb0..2148ed0 100644
>> >> >> >> --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
>> >> >> >> +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
>> >> >> >> @@ -105,7 +105,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
>> >> >> >>  }
>> >> >> >>
>> >> >> >>  static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
>> >> >> >> -                             struct snd_ctl_elem_value *ucontrol)
>> >> >> >> +                            struct snd_ctl_elem_value *ucontrol)
>> >> >> >>  {
>> >> >> >>       struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
>> >> >> >>       int changed = 0;
>> >> >> >
>> >> >> > This patch is corrupted and can not be applied :(
>> >> >>
>> >> >>
>> >> >> Why is this corrupted ?
>> >> >
>> >> > Try applying it with `git am`.  There should be space characters at the
>> >> > start of these lines but your email client deleted them:
>> >> >
>> >> >         struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
>> >> >         int changed = 0;
>> >> >
>> >> > Read Documentation/process/email-clients.rst
>> >> >
>> >> > regards,
>> >> > dan carpenter
>> >>
>> >>
>> >> Hello,
>> >>
>> >> I tried applying it with ' git am ' and it was giving me this error:
>> >>
>> >> fatal: corrupt patch at line XX
>> >
>> > Exactly.
>> >
>> >> I think this was produced because of running ./scripts/cleanfile on the patch .
>> >
>> > Why would you do that?  By doing that you corrupted the patch file :(
>>
>> After I run ./scritps/checkpatch.pl on the patch produced by git
>> format-patch it has trailing whitespaces . So I was using
>> ./scripts/cleanfile to fix that , I am not doing that anymore and am
>> also not getting the corrupt patch error .
>
> That means your code had trailing whitespaces, always fix that and NEVER
> hand-edit or modify a patch unless you really know what you are doing.
>
>> > Just use the proper output of 'git format-patch' and all will be fine.
>>
>> I have done this and am still getting these errors:
>>
>> error: patch failed:
>> drivers/staging/vc04_services/bcm2835-audio/bcm2835-      ctl.c:105
>>
>> error: drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c:
>> patch does not apply
>>
>>
>> Why is it not applying ?
>
> That is up to you to figure out, we have no idea as to exactly what you
> are doing :)

I guess , I was applying the patch to the same repository I made the
change in :P , I am not getting any errors now .
>
> good luck!
>
> greg k-h

Regards,
Srishti

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web