[Web10g-user] Web10g TCP statistics patch - mainlining into kernel?

Dominic Hamon dominic at google.com
Fri Jan 25 15:14:03 EST 2013


On Fri, Jan 25, 2013 at 10:57 AM, <Valdis.Kletnieks at vt.edu> wrote:

> On Fri, 25 Jan 2013 10:38:59 -0800, Dominic Hamon said:
> > Hello Valdis
> >
> > I actually just finished patching a fork from the kernel github repo
> here:
> > https://github.com/dominic-mlab/linux with a view to pushing it up. I
> > haven't pushed a patch upstream before, so any guidance is welcome.
>
> A quick browse over that git repo looks like it's unfortunately a tad
> busticated - you've apparently got development on the 'master' branch,
> instead
> of starting a separate branch.  This effectively means that it can't be
> easily
> pulled upstream.  Fortunately, you only have one commit against it so
> far, so you can probably recover by rejecting that commit so you're back
> to a Linus tree, and then create a branch and do subsequent development
> there.
>
>
Ah yes, sorry about that. There's now a web10g branch with the isolated
changes.

Note - the only reason I have this instead of using the web10g git repo is
that I'm finding it easier to track upstream changes and merge them in this
way.



> Question for the netdev people - you prefer pull requests based off
> a Linus tree, or linux-next, davem/(net,net-next), or some other tree?
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.psc.edu/pipermail/web10g-user/attachments/20130125/f63d23fe/attachment-0001.html 


More information about the Web10g-user mailing list