Re: [PATCH v2] staging: speakup: Fix warning of line over 80 characters.

[Greg KH]

On Sat, Feb 07, 2015 at 06:34:39PM -0800, shirish gajera wrote:
> On Sat, Feb 7, 2015 at 4:33 PM, Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> 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 <gregkh@xxxxxxxxxxxxxxxxxxx>
>     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 <gajerashirish@xxxxxxxxx>
>     >     > ---
>     >     >  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
    <now do 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/