[Cbe-oss-dev] 2.6.21-rc4-arnd1

[Julio M. Merino Vidal]

On 20/03/2007, at 23:13, Arnd Bergmann wrote:

> On Tuesday 20 March 2007 22:18:02 Julio M. Merino Vidal wrote:
>> Will you merge ericvh's systemsim branch too?  I'm currently
>> maintaining some patches and it is somewhat painful to have to make
>> them work on two different branches (systemsim and ps3-linux).
>
> It's merged in 2.6.20-arnd3, but I generally don't like to have
> it in my code, since it won't ever get upstream.

Oh, it's unfortunate to hear that.  May I ask why it won't ever be in  
upstream?

> I sometimes merge systemsim.git into a branch of cell-2.6.git,
> but I stopped doing that after ericvh removed some objects
> from his repository and that broke my own one.
>
> It may be worthwhile to have a merged tree again, that combines
> my patches with ps3-linux.git and systemsim.git.

I could find it useful to be able to test some changes locally on the  
simulator before deploying the kernel to the PS3.  You surely know  
that changes to the kernel often don't work on the first try ;-)

>
>> And by the way, could you add a description to that branch?  I'm
>> assuming here this is related to your cell-2.6 tree at
>> git.kernel.org.  That branch does not have a description.
>
> Good point. I frequently forget to update the git tree, in part
> because there seem to be few people that want to use it, so I
> mainly use it for merging with paulus.
>
> If you think it helps, I can integrate the git stuff into my
> scripts so that we get a branch in there for every patch set
> I upload to my patches directory.

Aha.  I find it much more comfortable to work against a SCM (whatever  
it is) rather than against an extracted tarball.  Way easier to get  
the latest code, revert changes, see what has changed in the tree,  
extract diffs, and, with a distributed system such as git, keep  
history for local development until the changes can be published  
(plus when they are released, all the history is kept) or easily  
distribute these custom sources among multiple local machines.  So  
summarizing, yes, it'd be nice to have your cell-2.6 branch in synch :-)

I'll check quilt though.  Might be good enough for some other use cases.

Thanks!

-- 
Julio M. Merino Vidal <jmerino at ac.upc.edu>