Re: [PATCH v7] Staging: octeon: Fix blank lines warnings

[Greg KH <gregkh@linuxfoundation.org>]

On Wed, Sep 21, 2016 at 08:49:39AM -0400, Ronald Rojas wrote:
> On Tue, Sep 20, 2016 at 01:51:19PM +0200, Greg KH wrote:
> > On Sun, Sep 18, 2016 at 07:04:19PM -0400, Ronald Rojas wrote:
> > > Fixes several of the checkpatch.pl warnings to
> > > not use multiple blank lines
> > > 
> > > Signed-off-by: Ronald Rojas <ronladred@gmail.com>
> > > ---
> > > v7: changed to staging tree instead of torvalds tree
> > >  drivers/staging/octeon/ethernet.c | 2 --
> > >  1 file changed, 2 deletions(-)
> > 
> > What branch are you using?  This still doesnt apply.  Please use the
> > staging-next or better yet, staging-testing.
> I'd like to confirm that I'm doing this correctly so that the next patch 
> I send to you will be correct. This is what I have done: 
> I cloned your repository directly under gregkh/staging.git

Good.

> I've checked out staging-testing and created my own branch I called
> ronald-branch.

Good.

> Then, when I had ronald-branch checked out, I ran "git merge staging-testing", 
> to make sure ronald-branch was up to date.

Hm, ok.  But now you have a merge, not your patch on top of my
changes...

> Then I make the appropriate changes and resubmit patch the patch?

How are you generating the patch?  If you do something like:
	git diff staging-testing..HEAD > my.patch
great.
but if you do something like:
	git format-patch staging-testing..HEAD
then you will end up with a mess.

What you might want to do is just rebase your branch on top of mine,
when changes come into it.

To do this, in your repo:
	git fetch --all
	git checkout staging-testing
	git pull
	git checkout ronald-branch
	git rebase staging-testing

that will update staging-testing to the latest, and then rebase whatever
you had in your branch on top of it.  I like to use the '-i' option to
rebase to see what you are doing, but that's up to you.

Hope this helps,

greg k-h