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

[Steve Wise]

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).   

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).

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

Steve.

On Sun, 2007-03-11 at 11:12 +0200, Michael S. Tsirkin wrote:
> Hi!
> I'm considering pulling git from linus 2.6.21-rc3 - this would
> make development easier by cutting down the number of patches
> we have to apply.
> 
> 2 things I'm still checking and I'd like to get confirmation on:
> 
> 1. merged_sean_rdma_dev_ofed_1_2.patch - I think all multicast bits
>    are merged in 2.6.21-rc3 so we only have to take code from local_sa
>    branch now. Right?
> 
> 2. ipath-xxx - except ipath-26-wc-qp.patch, these aren't upstream
>    so they still have to be applied. Correct?
> 
> 3. ehca-xxx - these all seem to be applied
>