On Mon, 06 Jun 2011 16:24:46 -0700 Keith Packard <keithp@xxxxxxxxxx> wrote: > On Mon, 6 Jun 2011 13:36:18 -0700, Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> wrote: > > > Can you keep drm-intel-next fairly up to date with respect to the fixes > > branch? I.e. keep it a superset of drm-intel-fixes for the most part? > > Yes, I wanted to do that now, but -fixes is not a fast-forward from > -next and I thought I shouldn't be doing rebases. You shouldn't if your downstream is using git trees and you're pulling from them, but it depends on your downstream. In my particular case, I'm ok with rebases if it means I get fixes. :) -- Jesse Barnes, Intel Open Source Technology Center _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
