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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
