[openib-general] idea for ofed 1 2 kernel file structure

[Michael S. Tsirkin]

> Quoting Steve Wise <swise at opengridcomputing.com>:
> Subject: Re: [openib-general] idea for ofed 1 2 kernel file structure
> 
> On Mon, 2007-02-05 at 06:20 -0800, Roland Dreier wrote:
> >  > I looked a current ofed 1.2 kernel tree and there is 1 thing I dislike:
> >  > It is hard to see changes that are specific to OFED since we have whole
> >  > kernel history mixed in.
> > 
> > I'm not sure how you have your branches set up, but if you have
> > something like a "linus" branch that tracks the upstream kernel, it's
> > easy to do stuff like "git log linus.." or "git diff linus.. drivers/infiniband"
> > and see the differences that way.
> > 
> > Using git that way (which is what it's designed for, after all) seems
> > better than some scripts to munge together two trees.
> > 
> 
> So git "log linus.." would show commits in the current branch that are
> not in the linus branch, correct?
> 
> That would work.  Two branches:  one with the main kernel git tree, and
> based on that + the ofed-specific changes.  

Well, that's what we have now.
The master branch tracks upstream kernel.

-- 
MST