From: Linus Torvalds <torvalds@osdl.org>
Date: Tue, 19 Apr 2005 03:04:56 GMT
Subject: Re: SCSI trees, merges and git status
Message-ID: <Pine.LNX.4.58.0504182003480.15725@ppc970.osdl.org>
In-Reply-To: <1113877071.4998.111.camel@mulgrave>



On Mon, 18 Apr 2005, James Bottomley wrote:
> 
> Fair enough.  If you pull from
> 
> rsync://www.parisc-linux.org/~jejb/scsi-misc-2.6.git

Thanks. Pulled and pushed out.

> Doing this exposed two bugs in your merge script:
> 
> 1) It doesn't like a completely new directory (the misc tree contains a
> new drivers/scsi/lpfc)
> 2) the merge testing logic is wrong.  You only want to exit 1 if the
> merge fails.

Applied.

		Linus