* [PATCH v7] Staging: octeon: Fix blank lines warnings
@ 2016-09-18 23:04 Ronald Rojas
2016-09-20 11:51 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Ronald Rojas @ 2016-09-18 23:04 UTC (permalink / raw)
To: gregkh; +Cc: outreachy-kernel
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(-)
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index 790477c..d02e3e3 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v7] Staging: octeon: Fix blank lines warnings
2016-09-18 23:04 [PATCH v7] Staging: octeon: Fix blank lines warnings Ronald Rojas
@ 2016-09-20 11:51 ` Greg KH
2016-09-21 12:49 ` Ronald Rojas
0 siblings, 1 reply; 4+ messages in thread
From: Greg KH @ 2016-09-20 11:51 UTC (permalink / raw)
To: Ronald Rojas; +Cc: outreachy-kernel
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.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v7] Staging: octeon: Fix blank lines warnings
2016-09-20 11:51 ` Greg KH
@ 2016-09-21 12:49 ` Ronald Rojas
2016-09-21 14:00 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Ronald Rojas @ 2016-09-21 12:49 UTC (permalink / raw)
To: Greg KH; +Cc: outreachy-kernel
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 . 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,
>
> greg k-h
Thanks for the help,
Ronald Rojas
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v7] Staging: octeon: Fix blank lines warnings
2016-09-21 12:49 ` Ronald Rojas
@ 2016-09-21 14:00 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2016-09-21 14:00 UTC (permalink / raw)
To: Ronald Rojas; +Cc: outreachy-kernel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-21 14:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-18 23:04 [PATCH v7] Staging: octeon: Fix blank lines warnings Ronald Rojas
2016-09-20 11:51 ` Greg KH
2016-09-21 12:49 ` Ronald Rojas
2016-09-21 14:00 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.