<div dir="ltr"><div class="gmail_default" style="font-family:arial,helvetica,sans-serif;font-size:small;color:rgb(51,51,51)"><br></div><div class="gmail_extra"><div class="gmail_quote">On Fri, Jan 25, 2013 at 10:57 AM, <span dir="ltr"><<a href="mailto:Valdis.Kletnieks@vt.edu" target="_blank" class="cremed">Valdis.Kletnieks@vt.edu</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Fri, 25 Jan 2013 10:38:59 -0800, Dominic Hamon said:<br>
> Hello Valdis<br>
><br>
> I actually just finished patching a fork from the kernel github repo here:<br>
> <a href="https://github.com/dominic-mlab/linux" target="_blank" class="cremed">https://github.com/dominic-mlab/linux</a> with a view to pushing it up. I<br>
> haven't pushed a patch upstream before, so any guidance is welcome.<br>
<br>
A quick browse over that git repo looks like it's unfortunately a tad<br>
busticated - you've apparently got development on the 'master' branch, instead<br>
of starting a separate branch. This effectively means that it can't be easily<br>
pulled upstream. Fortunately, you only have one commit against it so<br>
far, so you can probably recover by rejecting that commit so you're back<br>
to a Linus tree, and then create a branch and do subsequent development there.<br>
<br></blockquote><div><br></div><div><div style="font-family:arial,helvetica,sans-serif;font-size:small;color:rgb(51,51,51)" class="gmail_default">Ah yes, sorry about that. There's now a web10g branch with the isolated changes.</div>
<div style="font-family:arial,helvetica,sans-serif;font-size:small;color:rgb(51,51,51)" class="gmail_default"><br></div><div style="font-family:arial,helvetica,sans-serif;font-size:small;color:rgb(51,51,51)" class="gmail_default">
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.</div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Question for the netdev people - you prefer pull requests based off<br>
a Linus tree, or linux-next, davem/(net,net-next), or some other tree?<br>
<br>
</blockquote></div><br></div></div>