From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753217AbbBHCn3 (ORCPT ); Sat, 7 Feb 2015 21:43:29 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:33791 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751066AbbBHCn2 (ORCPT ); Sat, 7 Feb 2015 21:43:28 -0500 Date: Sun, 8 Feb 2015 10:43:24 +0800 From: Greg KH To: shirish gajera Cc: William Hubbs , Christopher Brannon , kirk@reisers.ca, Samuel Thibault , Domagoj =?utf-8?B?VHLFoWFu?= , Dan Carpenter , Ben Hutchings , Roxana Blaj , Robin Schroer , Dilek =?iso-8859-1?Q?=DCz=FClmez?= , DaeSeok Youn , =?utf-8?Q?Ay=C5=9Fe_Melike_Yurto=C4=9Flu?= , Rusty Russell , tapaswenipathak@gmail.com, sasha.levin@oracle.com, speakup@linux-speakup.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] staging: speakup: Fix warning of line over 80 characters. Message-ID: <20150208024324.GA15396@kroah.com> References: <20150131221943.GA15580@shirish-ThinkPad-Edge-E430> <20150207090922.GA28003@kroah.com> <20150208003325.GC2504@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Feb 07, 2015 at 06:34:39PM -0800, shirish gajera wrote: > On Sat, Feb 7, 2015 at 4:33 PM, Greg KH wrote: > > On Sat, Feb 07, 2015 at 09:46:37AM -0800, shirish gajera wrote: > > On Sat, Feb 7, 2015 at 1:09 AM, Greg KH > wrote: > > > >     On Sat, Jan 31, 2015 at 02:19:43PM -0800, Shirish Gajera wrote: > >     > This patch fixes the checkpatch.pl warning: > >     > > >     > WARNING: line over 80 characters > >     > > >     > All line over 80 characters in driver/staging/speakup/* are fixed. > >     > Aditional changes suggest by mailing list are also fixed. > >     > > >     > Signed-off-by: Shirish Gajera > >     > --- > >     >  drivers/staging/speakup/main.c           | 12 ++++++++---- > >     >  drivers/staging/speakup/serialio.h       |  3 ++- > >     >  drivers/staging/speakup/speakup.h        |  6 ++++-- > >     >  drivers/staging/speakup/speakup_decext.c |  6 ++++-- > >     >  drivers/staging/speakup/speakup_decpc.c  |  6 ++++-- > >     >  drivers/staging/speakup/spk_priv.h       |  3 ++- > >     >  drivers/staging/speakup/spk_types.h      |  3 ++- > >     >  drivers/staging/speakup/synth.c          | 10 +++++----- > >     >  8 files changed, 31 insertions(+), 18 deletions(-) > > > >     This fails to apply to my tree for some reason :( > > > >     Can you refresh it and resend? > > > >     thanks, > > > >     greg k-h > > > > > > > > It is already refreshed from last time.  > > > > Can you clarify refresh means git pull and resend right ? Is there any > other > > way of refresh ? > > Yes it does.  What tree and branch are you making these against?  They > should be against my staging.git tree on git.kernel.org, and against the > staging-testing branch.  Anything else might have conflicts. > > thanks, > > greg k-h > > > I clone this directory git clone -b staging-next git://git.kernel.org/pub/scm/ > linux/kernel/git/gregkh/staging.git So, I am hoping it's pointing to your tree. Yes it is. > I still didn't understand what staging-testing branch is ? Also I can check if > there is some conflicts. I check this one http:// > driverdev.linuxdriverproject.org/pipermail/driverdev-devel/ for january and > February I don't see any conflicts. > > Can you elaborate more why it's failing ? I can't dig through your web link, but if you don't know about git branches, then odds are you are making this against the wrong set of code. Read up some tutorials on git that describe how to work with branches, that should help out. A short example of what to do might be:  git clone -b staging-next git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git cd staging git checkout -t -b staging-testing origin/staging-testing git chekout -b work that will create a local branch called "staging-testing" that will track my upstream staging-testing, and a local branch for you to work on called "work". Then diff between work and staging-testing and you should be all set. Hope this helps, greg k-h