Q for Git repository for 2.6

Hi,

Ok, looks like I'm going to need to make diffs off the
git repository, as I'm already using a different git
repository to pull down other kernel patches that I
need and I don't know of a simple way of merging two
git repositories in which incompatiable changes are
not only possible but likely, unless someone has a
good tool for this.

Is there anything in the current tree that is known to
be fragile or known to conflict with just about
anything?

Jonathan

__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com 

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642