Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753968Ab1FFXat (ORCPT ); Mon, 6 Jun 2011 19:30:49 -0400 Received: from oproxy3-pub.bluehost.com ([69.89.21.8]:51956 "HELO oproxy3-pub.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751085Ab1FFXas (ORCPT ); Mon, 6 Jun 2011 19:30:48 -0400 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References:X-Mailer:Mime-Version:Content-Type:Content-Transfer-Encoding:X-Identified-User; b=TG3N6lSpW+Kjoo7eZIUBcyQ0ly+hx8TsFLHCC2ajEzeT4RSfZCrNCBsS57m34iUCfDKVrOVe5ZYOO8/yxrRHwcEhbAL2iTeBSuw9gi0/76bAHolFUeJ5IhvmnlLN5LAQ; Date: Mon, 6 Jun 2011 16:30:25 -0700 From: Jesse Barnes To: Keith Packard Cc: dri-devel@lists.freedesktop.org, "drivers\, Intel" , linux-kernel Subject: Re: drivers/drm/i915 maintenance process Message-ID: <20110606163025.5b1bfdee@jbarnes-desktop> In-Reply-To: References: <20110606133618.478fc5d9@jbarnes-desktop> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.22.0; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 930 Lines: 22 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/