From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: drivers/drm/i915 maintenance process Date: Mon, 6 Jun 2011 16:30:25 -0700 Message-ID: <20110606163025.5b1bfdee@jbarnes-desktop> References: <20110606133618.478fc5d9@jbarnes-desktop> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Keith Packard Cc: dri-devel@lists.freedesktop.org, "drivers, Intel" , linux-kernel List-Id: intel-gfx@lists.freedesktop.org On Mon, 06 Jun 2011 16:24:46 -0700 Keith Packard wrote: > On Mon, 6 Jun 2011 13:36:18 -0700, Jesse Barnes 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