Re: drivers/drm/i915 maintenance process

On Mon, 6 Jun 2011 13:36:18 -0700, Jesse Barnes jbarnes@virtuousgeek.org 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.

In PCI-land, this means re-basing my -next tree periodically before the merge window opens (though not right before the merge window unless something unexpected happens, like a patch needing to be dropped; in that case I'll delay the merge window push a bit to allow for more testing).

If a rebase around -RC1 is reasonable, then I'll do that now and move changes over to that.