On Sat, Jan 08, 2005 at 04:10:36AM +0000, Dave Airlie wrote: > > Hi, > I've just noticed that Alan has checked some changes into > extras/drm in the Xorg tree, I'm sure these are needed to build the latest > drivers but I'm just wondering how we should approach these things in > future? The DRM isn't merged in at a regular rate, so I think it's right to commit changes to imported code, especially if other code relies on the changes.
> When we next import a DRM from the main tree will we have to much about > with CVS admin to put things back on the vendor branch? You shouldn't have to muck about with CVS admin. I don't understand this. Using 'cvs import' and fixing conflicts should be fine. > Dave. > p.s. Alan can you check those changes into the main DRM repository you > only got pieces of them so I can push them to Linus.... There were some extra DPMS code in X.Org's DRM which I'm massaging into the DRM trunk, but's it's not perfect yet because of the diverging code there. But don't worry I'll get to it. Alan. ------------------------------------------------------- The SF.Net email is sponsored by: Beat the post-holiday blues Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek. It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt -- _______________________________________________ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
