[ofa-general] ANNOUNCE ofed backports for 2.6.22 kernel bits

[Michael S. Tsirkin]

> > - A single git reset ORIG_HEAD recovers from a conflicting merge
> 
> if, though, you must have a pristine environment,
> this is easily solved by using an intermediate repo:
> 
> git clone -s <canonical repo>
> <run the pull>
> <any conflicts, dump this guy, otherwise, pull this in>

Ah, you now see how git reset is broken.
What about git rebase? Broken too I'm afraid.
Anything that rewrites history is.

> i bet this is very similar time-wise to running the
> merge, then the ofed_scripts/configure over all supported
> branches.  merges in git are _fast_...

Full tree checkout is slow though.

> > - A single tag tags all code for all kernels
> 
> store commit ids in a file and tag that?

This trick breaks some more git utilities.
E.g. git describe, git web displaying tags ...

-- 
MST