Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422704AbWAMOua (ORCPT ); Fri, 13 Jan 2006 09:50:30 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1422707AbWAMOu3 (ORCPT ); Fri, 13 Jan 2006 09:50:29 -0500 Received: from emailhub.stusta.mhn.de ([141.84.69.5]:44555 "HELO mailout.stusta.mhn.de") by vger.kernel.org with SMTP id S1422705AbWAMOu2 (ORCPT ); Fri, 13 Jan 2006 09:50:28 -0500 Date: Fri, 13 Jan 2006 15:50:27 +0100 From: Adrian Bunk To: Greg KH Cc: Linus Torvalds , "Brown, Len" , "David S. Miller" , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, akpm@osdl.org, git@vger.kernel.org Subject: Re: git pull on Linux/ACPI release tree Message-ID: <20060113145027.GN29663@stusta.de> References: <20060108230611.GP3774@stusta.de> <20060110201909.GB3911@stusta.de> <20060112013706.GA3339@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060112013706.GA3339@kroah.com> User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1250 Lines: 36 On Wed, Jan 11, 2006 at 05:37:06PM -0800, Greg KH wrote: > On Tue, Jan 10, 2006 at 09:19:09PM +0100, Adrian Bunk wrote: > > > > I am using the workaround of carrying the patches in a mail folder, > > applying them in a batch, and not pulling from your tree between > > applying a batch of patches and you pulling from my tree. > > Ick, I'd strongly recommend using quilt for this. It works great for > just this kind of workflow. It works in my case because I'm only going through the folder with the trivial patches in batches and ask Linus to pull from my tree immediately after I'm finished. That would certainly not be a recommended practice for a subsystem maintainer, but I'm handling only trivial patches. > thanks, > > greg k-h cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed - 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/