[ofa-general] Re: RFC: pull from 2.6.21

Michael S. Tsirkin mst at dev.mellanox.co.il
Mon Mar 12 13:24:18 PDT 2007


> Quoting Steve Wise <swise at opengridcomputing.com>:
> Subject: Re: RFC: pull from 2.6.21
> 
> For the chelsio drivers, you're gonna have problems since they are now
> in 2.6.21.  So pulling will result in a collision since you committed
> these directly into ofed_1_2 (no common ancestor for the merge).   

Yes we'll have ot replace these.

> However if you want to do this, I'm all for it so that the code bases
> are aligned exactly as of 2.6.21.  The code isn't very different except
> that I did more clean up work for 2.6.21 (like getting rid of the core
> directory).

Will there be problems with backports?
Are you OK with fixing them if necessary?

> If you do this, then are you comitting to do a final pull when 2.6.21
> goes gold?

Depends on the time scale, but basically yes.

-- 
MST



More information about the general mailing list