On Fri, Aug 26, 2011 at 01:17:57PM -0500, Larry Finger wrote: > On 08/26/2011 12:50 PM, Greg KH wrote: > > > >Ok, I pulled from the above link, but got a whole bunch more patches, > >and a merge because of duplicate patches in my tree and yours. > > > >But we should be all in sync now, please check to verify I didn't mess > >anything up. > > The staging-next branch looks fine. I think the problem was my fault > as I pushed from staging-next. > > Would it be correct to develop new stuff in the master branch and push from there? No, that tracks Linus's upstream branch. You should be developing against staging-next, which is fine, it just got messed up as I applied a bunch of patches from email and didn't pull from you. The second set of patches I ended up pulling all of the original ones as well. So you ended up with a number of duplicate patches in the tree, which git handled just fine, it will just look odd if you export all of the patches at the same time. So all is good, don't worry about it. greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
