[ofa-general] Re: Question about git tree

[Roland Dreier]

 > Last night you submitted the NAPI work for 2.6.22. When I checked a
 > few minutes ago I saw that the NAPI work has been merged into the
 > for-linus tree and not the for-2.6.22 tree.

Yes, that was a temporary situation until Linus pulled everything into
his tree (which he now has done).

 > I want to merge and test my patch against the latest tree -which git
 > tree should I use? Can you please provide insight into how this
 > procedure works, or if it is documented please provide a pointer.

Your question is actually a fairly deep one.  In fact in the git world
the concept of "latest tree" is not defined.  A situation such as for
example some fixes queued in for-2.6.22 and some new features queued
in for-2.6.23 is quite common.  And for-mm in general is something
like the union of everything that has a chance at being merged within
the next couple of kernel releases.

So I guess you just have to use some judgement and look at which tree
has things that are likely to impact what you're working on.

 - R.