Staging: octeon: Fix blank lines warnings

Fixes several of the checkpatch.pl warnings to
not use multiple blank lines

---
v7: changed to staging tree instead of torvalds tree

 drivers/staging/octeon/ethernet.c | 2 --
 1 file changed, 2 deletions(-)

index 790477c..d02e3e3 100644
@@ -694,7 +694,6 @@ static int cvm_oct_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-
 	cvm_oct_configure_common_hw();
 
 	cvmx_helper_initialize_packet_io_global();

@@ -937,7 +936,6 @@ static int cvm_oct_remove(struct platform_device *pdev)
 		}
 	}
 
-
 	cvmx_pko_shutdown();
 
 	cvmx_ipd_free_ptr();

2.7.4

What branch are you using? This still doesnt apply. Please use the staging-next or better yet, staging-testing.

thanks,

greg k-h

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 . I've checked out staging-testing and created my own branch I called ronald-branch. Then, when I had ronald-branch checked out, I ran "git merge staging-testing", to make sure ronald-branch was up to date.
Then I make the appropriate changes and resubmit patch the patch?

Thanks for the help,
Ronald Rojas

Good.

Good.

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

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