On Fri, Oct 02, 2009 at 02:38:46PM -0700, Eric Anholt wrote: > On Tue, 2009-09-15 at 22:57 +0200, Daniel Vetter wrote: > OK, I've finally pulled this for -next, with a bit of hand resolving of > conflicts. I debated, because of the somewhat unusual series of adding > the ring sync, implementing, fixing the ring sync use, then removing > ring sync. Often, that sort of stuff gets flattened out in the commit > history. However, in this case I think it's OK as overlays are touchy > and bisectability for "is the interruptible stuff working correctly" may > prove useful. I've actually flattened all previous iterations. But when I was tackling the non-interruptible sleeps, suddenly all my testers went awol. So I'd like to merge a somewhat tested base version for easier debugging.
> Then I noticed that you'd told me that there was newer stuff in your > gitorious tree. Only, that stuff claims to be older (v3), and doesn't > have some of the patches above. So I've pushed my merge to drm-overlay > of my tree for review -- is it what you think should land? I've actually rebased everything locally but then screwed up by pushing the wrong branch. Sorry for the mess and your duplicate effort. As mentioned on irc there's just a tiny fix missing. I'll follow up with a patch against drm-tree when I've finished stress-testing it on my box. Thanks, Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48 ------------------------------------------------------------------------------ Come build with us! The BlackBerry® Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9-12, 2009. Register now! http://p.sf.net/sfu/devconf -- _______________________________________________ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
