netdev
[Top] [All Lists]

Re: CVS tags (was Re: [Prism54-devel] Re: [PATCH 4/14 linux-2.6.7-rc1]

To: Valdis.Kletnieks@xxxxxx
Subject: Re: CVS tags (was Re: [Prism54-devel] Re: [PATCH 4/14 linux-2.6.7-rc1] prism54: add support for avs header in
From: Andreas Dilger <adilger@xxxxxxxxxxxxx>
Date: Thu, 27 May 2004 14:01:59 -0600
Cc: "Luis R. Rodriguez" <mcgrof@xxxxxxxxxxxxxxxxxxxx>, Jeff Garzik <jgarzik@xxxxxxxxx>, Andrew Morton <akpm@xxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxx, prism54-devel@xxxxxxxxxxx
In-reply-to: <200405271931.i4RJVjYB002642@xxxxxxxxxxxxxxxxxxxxxxx>
Mail-followup-to: Valdis.Kletnieks@xxxxxx, "Luis R. Rodriguez" <mcgrof@xxxxxxxxxxxxxxxxxxxx>, Jeff Garzik <jgarzik@xxxxxxxxx>, Andrew Morton <akpm@xxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxx, prism54-devel@xxxxxxxxxxx
References: <20040524083146.GE3330@xxxxxxxxxxxxxxxxxx> <40B631B3.4000902@xxxxxxxxx> <20040527191649.GT3330@xxxxxxxxxxxxxxxxxx> <200405271931.i4RJVjYB002642@xxxxxxxxxxxxxxxxxxxxxxx>
Sender: netdev-bounce@xxxxxxxxxxx
User-agent: Mutt/1.4.1i
On May 27, 2004  15:31 -0400, Valdis.Kletnieks@xxxxxx wrote:
> On Thu, 27 May 2004 15:16:49 EDT, Luis R. Rodriguez said:
> > --- ksrc/islpci_eth.c
> > +++ ksrc-new/islpci_eth.c
> 
> I think this was what he referred to:
> 
> >-/*  $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_eth.c,v 1.31 2004/03 
> >15:27:44 ajfa Exp $
> >+/*  $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_eth.c,v 1.33 2004/03/19 
> >23:03:58 ajfa Exp $
> 
> as this will almost surely cause rejects (sooner or later) unless 100% of your
> patches are applied and in the right order.

This also causes grief if this file is ever imported again into a CVS-based
SCM, unless you remember to do so with -ko.

Cheers, Andreas
--
Andreas Dilger
http://sourceforge.net/projects/ext2resize/
http://www-mddsp.enel.ucalgary.ca/People/adilger/


<Prev in Thread] Current Thread [Next in Thread>