Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752170AbdFNNuC (ORCPT ); Wed, 14 Jun 2017 09:50:02 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:56504 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751836AbdFNNuA (ORCPT ); Wed, 14 Jun 2017 09:50:00 -0400 Date: Wed, 14 Jun 2017 15:49:52 +0200 From: Greg KH To: srishti sharma Cc: Dan Carpenter , stefan.wahren@i2se.com, devel@driverdev.osuosl.org, Florian Fainelli , sbranden@broadcom.com, linux-kernel@vger.kernel.org, Eric Anholt , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, rjui@broadcom.com, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] Staging: vc04_services: bcm2835-audio: bcm2835-ctl.c: Fixed alignment to match open parenthesis. Message-ID: <20170614134952.GB24245@kroah.com> References: <1497042442-3620-1-git-send-email-srishtishar@gmail.com> <20170613130006.GA15978@kroah.com> <20170613144749.yn6z7yecumrfaayk@mwanda> <20170614050943.GC11953@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.8.3 (2017-05-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3295 Lines: 84 On Wed, Jun 14, 2017 at 07:11:01PM +0530, srishti sharma wrote: > On Wed, Jun 14, 2017 at 10:39 AM, Greg KH 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 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 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 > >> >> >> --- > >> >> >> 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